treewide: Drop __cficanonical

CONFIG_CFI_CLANG doesn't use a jump table anymore and therefore,
won't change function references to point elsewhere. Remove the
__cficanonical attribute and all uses of it.

Note that the Clang definition of the attribute was removed earlier,
just clean up the no-op definition and users.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220908215504.3686827-16-samitolvanen@google.com

diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 4f2a819fd60a34ca40067bdc2ceecf68578f893a..6f2ec0976e2d972b1acebf180d160fb9184722a0 100644 (file)
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -265,10 +265,6 @@ struct ftrace_likely_data {
 # define __nocfi
 #endif
 
-#ifndef __cficanonical
-# define __cficanonical
-#endif
-
 /*
  * Any place that could be marked with the "alloc_size" attribute is also
  * a place to be marked with the "malloc" attribute. Do this as part of the

diff --git a/include/linux/init.h b/include/linux/init.h
index 88f2964097f593b7e8a5d0e673882f77afb108d1..a0a90cd73ebeeb34ca681bb6a2081d2b0485a06d 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -220,8 +220,8 @@ extern bool initcall_debug;
        __initcall_name(initstub, __iid, id)
 
 #define __define_initcall_stub(__stub, fn)                     \
-       int __init __cficanonical __stub(void);                 \
-       int __init __cficanonical __stub(void)                  \
+       int __init __stub(void);                                \
+       int __init __stub(void)                                 \
        {                                                       \
                return fn();                                    \
        }                                                       \

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 060af91bafcd415411f5d4c23ceb51c75ceed639..5da0846aa3c17ecd44646dbd0b5ca47c9493fddc 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2019,8 +2019,8 @@ enum pci_fixup_pass {
 #ifdef CONFIG_LTO_CLANG
 #define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class,  \
                                  class_shift, hook, stub)              \
-       void __cficanonical stub(struct pci_dev *dev);                  \
-       void __cficanonical stub(struct pci_dev *dev)                   \
+       void stub(struct pci_dev *dev);                                 \
+       void stub(struct pci_dev *dev)                                  \
        {                                                               \
                hook(dev);                                              \
        }                                                               \