tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ima: efi: Drop unnecessary check for CONFIG_MODULE_SIG/CONFIG_KEXEC_SIG

When configuration settings are disabled the guarded functions are
defined as empty stubs, so the check is unnecessary.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: Aaron Tomlin <atomlin@atomlin.com>
Reviewed-by: Nicolas Schier <nsc@kernel.org>
[zohar@linux.ibm.com: fixed merge conflict with commit 63e8a44395a4]
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>

authored by

Thomas Weißschuh and committed by
Mimi Zohar 658d5c72 01baa39c

+2 -4
+2 -4
security/integrity/ima/ima_efi.c
··· 25 25 const char * const *arch_get_ima_policy(void) 26 26 { 27 27 if (IS_ENABLED(CONFIG_IMA_ARCH_POLICY) && arch_get_secureboot()) { 28 - if (IS_ENABLED(CONFIG_MODULE_SIG)) 29 - set_module_sig_enforced(); 30 - if (IS_ENABLED(CONFIG_KEXEC_SIG)) 31 - set_kexec_sig_enforced(); 28 + set_module_sig_enforced(); 29 + set_kexec_sig_enforced(); 32 30 return sb_arch_rules; 33 31 } 34 32 return NULL;