Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: cfi: fix export symbol types

Browse source 
In commit d71a92631c51 ("ANDROID: add support for Clang's Control Flow
Integrity (CFI)") some new symbols were exported, but they should have
been set as _GPL symbols.

Fix this up by properly.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6ecbb0f3b33f7c02c9b75bb7d80c35ce80e553f3
This commit is contained in:
Greg Kroah-Hartman 2020-04-29 15:20:54 +02:00
parent 7f86a29040
commit fe28410e4e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/cfi.c
View file

@ -215,14 +215,14 @@ void cfi_module_add(struct module *mod, unsigned long min_addr,
{ {
update_shadow(mod, min_addr, max_addr, add_module_to_shadow); update_shadow(mod, min_addr, max_addr, add_module_to_shadow);
} }
EXPORT_SYMBOL(cfi_module_add); EXPORT_SYMBOL_GPL(cfi_module_add);
void cfi_module_remove(struct module *mod, unsigned long min_addr, void cfi_module_remove(struct module *mod, unsigned long min_addr,
unsigned long max_addr) unsigned long max_addr)
{ {
update_shadow(mod, min_addr, max_addr, remove_module_from_shadow); update_shadow(mod, min_addr, max_addr, remove_module_from_shadow);
} }
EXPORT_SYMBOL(cfi_module_remove); EXPORT_SYMBOL_GPL(cfi_module_remove);
static inline cfi_check_fn ptr_to_check_fn(const struct cfi_shadow __rcu *s, static inline cfi_check_fn ptr_to_check_fn(const struct cfi_shadow __rcu *s,
unsigned long ptr) unsigned long ptr)
@ -291,14 +291,14 @@ void cfi_slowpath_handler(uint64_t id, void *ptr, void *diag)
else /* Don't allow unchecked modules */ else /* Don't allow unchecked modules */
handle_cfi_failure(ptr); handle_cfi_failure(ptr);
} }
EXPORT_SYMBOL(cfi_slowpath_handler); EXPORT_SYMBOL_GPL(cfi_slowpath_handler);
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
void cfi_failure_handler(void *data, void *ptr, void *vtable) void cfi_failure_handler(void *data, void *ptr, void *vtable)
{ {
handle_cfi_failure(ptr); handle_cfi_failure(ptr);
} }
EXPORT_SYMBOL(cfi_failure_handler); EXPORT_SYMBOL_GPL(cfi_failure_handler);
void __cfi_check_fail(void *data, void *ptr) void __cfi_check_fail(void *data, void *ptr)
{ {