fix CVE-2024-49954
Thomas Gleixner (1): [Backport] static_call: Replace pointless WARN_ON() in static_call_module_notify()
kernel/static_call_inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
From: Thomas Gleixner tglx@linutronix.de
stable inclusion from stable-v6.6.55 commit e67534bd31d79952b50e791e92adf0b3e6c13b8c category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRDC
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
[ Upstream commit fe513c2ef0a172a58f158e2e70465c4317f0a9a2 ]
static_call_module_notify() triggers a WARN_ON(), when memory allocation fails in __static_call_add_module().
That's not really justified, because the failure case must be correctly handled by the well known call chain and the error code is passed through to the initiating userspace application.
A memory allocation fail is not a fatal problem, but the WARN_ON() takes the machine out when panic_on_warn is set.
Replace it with a pr_warn().
Fixes: 9183c3f9ed71 ("static_call: Add inline static call infrastructure") Signed-off-by: Thomas Gleixner tglx@linutronix.de Signed-off-by: Peter Zijlstra (Intel) peterz@infradead.org Link: https://lkml.kernel.org/r/8734mf7pmb.ffs@tglx Signed-off-by: Sasha Levin sashal@kernel.org Signed-off-by: Liao Chen liaochen4@huawei.com --- kernel/static_call_inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c index f55354ccf16b..c46825692c04 100644 --- a/kernel/static_call_inline.c +++ b/kernel/static_call_inline.c @@ -437,7 +437,7 @@ static int static_call_module_notify(struct notifier_block *nb, case MODULE_STATE_COMING: ret = static_call_add_module(mod); if (ret) { - WARN(1, "Failed to allocate memory for static calls"); + pr_warn("Failed to allocate memory for static calls\n"); static_call_del_module(mod); } break;
反馈: 您发送到kernel@openeuler.org的补丁/补丁集,转换为PR失败! 邮件列表地址:https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V... 失败原因:应用补丁/补丁集失败,Patch failed at 0001 static_call: Replace pointless WARN_ON() in static_call_module_notify() 建议解决方法:请查看失败原因, 确认补丁是否可以应用在当前期望分支的最新代码上
FeedBack: The patch(es) which you have sent to kernel@openeuler.org has been converted to PR failed! Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V... Failed Reason: apply patch(es) failed, Patch failed at 0001 static_call: Replace pointless WARN_ON() in static_call_module_notify() Suggest Solution: please checkout if the failed patch(es) can work on the newest codes in expected branch