提交 deb6ca2e 编写于 作者: M Mimi Zohar 提交者: Zheng Zengkai

module: limit enabling module.sig_enforce

stable inclusion
from stable-5.10.47
commit 3051f230f19feb02dfe5b36794f8c883b576e184
bugzilla: 172973 https://gitee.com/openeuler/kernel/issues/I4DAKB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3051f230f19feb02dfe5b36794f8c883b576e184

--------------------------------

[ Upstream commit 0c18f29a ]

Irrespective as to whether CONFIG_MODULE_SIG is configured, specifying
"module.sig_enforce=1" on the boot command line sets "sig_enforce".
Only allow "sig_enforce" to be set when CONFIG_MODULE_SIG is configured.

This patch makes the presence of /sys/module/module/parameters/sig_enforce
dependent on CONFIG_MODULE_SIG=y.

Fixes: fda784e5 ("module: export module signature enforcement status")
Reported-by: NNayna Jain <nayna@linux.ibm.com>
Tested-by: NMimi Zohar <zohar@linux.ibm.com>
Tested-by: NJessica Yu <jeyu@kernel.org>
Signed-off-by: NMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: NJessica Yu <jeyu@kernel.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 e046c978
...@@ -272,9 +272,18 @@ static void module_assert_mutex_or_preempt(void) ...@@ -272,9 +272,18 @@ static void module_assert_mutex_or_preempt(void)
#endif #endif
} }
#ifdef CONFIG_MODULE_SIG
static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE); static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);
module_param(sig_enforce, bool_enable_only, 0644); module_param(sig_enforce, bool_enable_only, 0644);
void set_module_sig_enforced(void)
{
sig_enforce = true;
}
#else
#define sig_enforce false
#endif
/* /*
* Export sig_enforce kernel cmdline parameter to allow other subsystems rely * Export sig_enforce kernel cmdline parameter to allow other subsystems rely
* on that instead of directly to CONFIG_MODULE_SIG_FORCE config. * on that instead of directly to CONFIG_MODULE_SIG_FORCE config.
...@@ -285,11 +294,6 @@ bool is_module_sig_enforced(void) ...@@ -285,11 +294,6 @@ bool is_module_sig_enforced(void)
} }
EXPORT_SYMBOL(is_module_sig_enforced); EXPORT_SYMBOL(is_module_sig_enforced);
void set_module_sig_enforced(void)
{
sig_enforce = true;
}
/* Block module loading/unloading? */ /* Block module loading/unloading? */
int modules_disabled = 0; int modules_disabled = 0;
core_param(nomodule, modules_disabled, bint, 0); core_param(nomodule, modules_disabled, bint, 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册