diff options
| author | James Morris <james.morris@microsoft.com> | 2019-04-12 15:20:23 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-04-12 15:20:23 -0700 |
| commit | 2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d (patch) | |
| tree | e3abbdd39c488daec66a7c7b6d93e34b51145e54 /include | |
| parent | fe9fd2ef383c2f5883fcd3f7adce0de9ce2556ff (diff) | |
| parent | 41475a3ebaceb270e47a77356ddc30960354cb00 (diff) | |
| download | linux-stable-2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d.tar.gz linux-stable-2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d.tar.bz2 linux-stable-2bfebea90dd5e8c57ae1021a5d1bb6c1057eee6d.zip | |
Merge branch 'next-integrity-for-james' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-integrity
From Mimi:
"This pull request contains just three patches, the remainder are
either included in other pull requests (eg. audit, lockdown) or will
be upstreamed via other subsystems (eg. kselftests, Power). Included
in this pull request is one bug fix, one documentation update, and
extending the x86 IMA arch policy rules to coordinate the different
kernel module signature verification methods."
Diffstat (limited to 'include')
| -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 5bf5dcd91009..73ee2b10e816 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -676,6 +676,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... */ @@ -796,6 +797,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) |