It's no longer necessary to disable CFI checking for all __init
functions. Drop the __nocfi attribute.
Signed-off-by: Sami Tolvanen <[email protected]>
---
include/linux/init.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/init.h b/include/linux/init.h
index 76058c9e0399..a0a90cd73ebe 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -47,7 +47,7 @@
/* These are for everybody (although not all archs will actually
discard it in modules) */
-#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline __nocfi
+#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline
#define __initdata __section(".init.data")
#define __initconst __section(".init.rodata")
#define __exitdata __section(".exit.data")
--
2.36.0.550.gb090851708-goog
On Fri, May 13, 2022 at 01:21:59PM -0700, Sami Tolvanen wrote:
> It's no longer necessary to disable CFI checking for all __init
> functions. Drop the __nocfi attribute.
>
> Signed-off-by: Sami Tolvanen <[email protected]>
Maybe move this up after patch 11 (the arm64-wide __nocfi removal)?
Reviewed-by: Kees Cook <[email protected]>
--
Kees Cook
On Sat, May 14, 2022 at 3:03 PM Kees Cook <[email protected]> wrote:
>
> On Fri, May 13, 2022 at 01:21:59PM -0700, Sami Tolvanen wrote:
> > It's no longer necessary to disable CFI checking for all __init
> > functions. Drop the __nocfi attribute.
> >
> > Signed-off-by: Sami Tolvanen <[email protected]>
>
> Maybe move this up after patch 11 (the arm64-wide __nocfi removal)?
Yes, that makes sense. I'll move it.
Sami