diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 22:54:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-09 22:54:40 +0300 |
| commit | 7664cd6e3a0b2709f04c07435e96c7c85e7d7324 (patch) | |
| tree | d270574b311da6e449ad6dcea0bfc16e13d5aa78 /include/linux/module.h | |
| parent | 882388056194d2d4c3f589b194b6bdcc47e677e8 (diff) | |
| parent | 2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d (diff) | |
| download | linux-7664cd6e3a0b2709f04c07435e96c7c85e7d7324.tar.xz | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull intgrity updates from James Morris:
"This contains just three patches, the remainder were either included
in other pull requests (eg. audit, lockdown) or will be upstreamed via
other subsystems (eg. kselftests, Power).
Included here is one bug fix, one documentation update, and extending
the x86 IMA arch policy rules to coordinate the different kernel
module signature verification methods"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
doc/kernel-parameters.txt: Deprecate ima_appraise_tcb
x86/ima: add missing include
x86/ima: require signed kernel modules
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 484b5cbb3410..8f75277d4cef 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -677,6 +677,7 @@ static inline bool is_livepatch_module(struct module *mod) #endif /* CONFIG_LIVEPATCH */ bool is_module_sig_enforced(void); +void set_module_sig_enforced(void); #else /* !CONFIG_MODULES... */ @@ -803,6 +804,10 @@ static inline bool is_module_sig_enforced(void) return false; } +static inline void set_module_sig_enforced(void) +{ +} + /* Dereference module function descriptor */ static inline void *dereference_module_function_descriptor(struct module *mod, void *ptr) |