moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'modules-for-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

Browse Source 
Pull modules fix from Jessica Yu:

 - Build fix for cfi_init() when CONFIG_MODULE_UNLOAD=n

* tag 'modules-for-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: fix clang CFI with MODULE_UNLOAD=n
This commit is contained in:
Linus Torvalds
2021-10-13 07:42:07 -07:00
parent f4d0cc426f 0d67e332e6
commit 348949d9a4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/module.c
View File

@@ -4489,8 +4489,10 @@ static void cfi_init(struct module *mod)
/* Fix init/exit functions to point to the CFI jump table */ /* Fix init/exit functions to point to the CFI jump table */
if (init) if (init)
mod->init = *init; mod->init = *init;
#ifdef CONFIG_MODULE_UNLOAD
if (exit) if (exit)
mod->exit = *exit; mod->exit = *exit;
#endif
cfi_module_add(mod, module_addr_min); cfi_module_add(mod, module_addr_min);
#endif #endif