diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:08:33 -0800 |
| commit | 7f9f852c75e7d776b078813586c76a2bc7dca993 (patch) | |
| tree | 1870d8ce5b3a6b3b964a3d9cddf2c75e896fc61a /include | |
| parent | Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | ARM: module: Fix function kallsyms on Thumb-2 (diff) | |
| download | wireguard-linux-7f9f852c75e7d776b078813586c76a2bc7dca993.tar.xz wireguard-linux-7f9f852c75e7d776b078813586c76a2bc7dca993.zip | |
Merge tag 'modules-for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules updates from Jessica Yu:
- Some modules-related kallsyms cleanups and a kallsyms fix for ARM.
- Include keys from the secondary keyring in module signature
verification.
* tag 'modules-for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
ARM: module: Fix function kallsyms on Thumb-2
module: Overwrite st_size instead of st_info
module: make it clearer when we're handling kallsyms symbols vs exported symbols
modsign: use all trusted keys to verify module signature
Diffstat (limited to '')
| -rw-r--r-- | include/linux/module.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index fce6b4335e36..c0b4b7840b57 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -486,6 +486,13 @@ struct module { #define MODULE_ARCH_INIT {} #endif +#ifndef HAVE_ARCH_KALLSYMS_SYMBOL_VALUE +static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym) +{ + return sym->st_value; +} +#endif + extern struct mutex module_mutex; /* FIXME: It'd be nice to isolate modules during init, too, so they |