aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Drop __cficanonical

Browse Source 
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
This commit is contained in:
Sami Tolvanen
2022-09-08 14:54:57 -07:00
committed by Kees Cook
parent 4b24356312
commit 5659b598b4
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/compiler_types.h
View File

@@ -265,10 +265,6 @@ struct ftrace_likely_data {
# define __nocfi # define __nocfi
#endif #endif
#ifndef __cficanonical
# define __cficanonical
#endif
/* /*
* Any place that could be marked with the "alloc_size" attribute is also * 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 * a place to be marked with the "malloc" attribute. Do this as part of the

4
include/linux/init.h
View File

@@ -220,8 +220,8 @@ extern bool initcall_debug;
__initcall_name(initstub, __iid, id) __initcall_name(initstub, __iid, id)
#define __define_initcall_stub(__stub, fn) \ #define __define_initcall_stub(__stub, fn) \
int __init __cficanonical __stub(void); \ int __init __stub(void); \
int __init __cficanonical __stub(void) \ int __init __stub(void) \
{ \ { \
return fn(); \ return fn(); \
} \ } \

4
include/linux/pci.h
View File

@@ -2019,8 +2019,8 @@ enum pci_fixup_pass {
#ifdef CONFIG_LTO_CLANG #ifdef CONFIG_LTO_CLANG
#define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \ #define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
class_shift, hook, stub) \ class_shift, hook, stub) \
void __cficanonical stub(struct pci_dev *dev); \ void stub(struct pci_dev *dev); \
void __cficanonical stub(struct pci_dev *dev) \ void stub(struct pci_dev *dev) \
{ \ { \
hook(dev); \ hook(dev); \
} \ } \