diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 00:36:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 00:36:39 +0200 |
| commit | de7f01c22a29502b9bb10c2356f2d971206292d0 (patch) | |
| tree | 3908a048295527e68d23af38c1a85287462ae513 /kernel | |
| parent | Merge branch 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | module: Allow to always show the status of modsign (diff) | |
| download | linux-de7f01c22a29502b9bb10c2356f2d971206292d0.tar.xz linux-de7f01c22a29502b9bb10c2356f2d971206292d0.zip | |
Merge tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu:
"Minor code cleanup and also allow sig_enforce param to be shown in
sysfs with CONFIG_MODULE_SIG_FORCE"
* tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module: Allow to always show the status of modsign
module: Do not access sig_enforce directly
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c index 68469b37d61a..f475f30eed8c 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -274,9 +274,7 @@ static void module_assert_mutex_or_preempt(void) } static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE); -#ifndef CONFIG_MODULE_SIG_FORCE module_param(sig_enforce, bool_enable_only, 0644); -#endif /* !CONFIG_MODULE_SIG_FORCE */ /* * Export sig_enforce kernel cmdline parameter to allow other subsystems rely @@ -2785,7 +2783,7 @@ static int module_sig_check(struct load_info *info, int flags) } /* Not having a signature is only an error if we're strict. */ - if (err == -ENOKEY && !sig_enforce) + if (err == -ENOKEY && !is_module_sig_enforced()) err = 0; return err; |