From 4d1e4e58f0fca5895744393ee7fb6c3261fef76a Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Thu, 5 Nov 2026 11:16:16 +0800 Subject: [PATCH] =?UTF-8?q?[lwp]=20=E6=A0=A1=E9=AA=8C=20sigaction=20?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E7=BC=96=E5=8F=B7=20(#11899)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在信号处理表访问前校验信号编号,避免越界访问。 --- components/lwp/lwp_signal.c | 10 ++++++++++ components/lwp/syscall/syscall_signal.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/components/lwp/lwp_signal.c b/components/lwp/lwp_signal.c index b42455dfce..3cbb771775 100644 --- a/components/lwp/lwp_signal.c +++ b/components/lwp/lwp_signal.c @@ -1115,6 +1115,16 @@ rt_err_t lwp_signal_action(struct rt_lwp *lwp, int signo, rt_list_t *thread_list; rt_err_t ret = RT_EOK; + /* + * Signal numbers are 1-based. valid_signo_check() accepts 0 for the + * kill(pid, 0) probe, so reject it here as well before using signo - 1 + * to index sig_action[]. + */ + if (signo <= 0 || valid_signo_check(signo)) + { + return -RT_EINVAL; + } + if (lwp) { /** acquire READ access to lwp */ diff --git a/components/lwp/syscall/syscall_signal.c b/components/lwp/syscall/syscall_signal.c index e0fb7459c1..cf2686b7ce 100644 --- a/components/lwp/syscall/syscall_signal.c +++ b/components/lwp/syscall/syscall_signal.c @@ -50,6 +50,12 @@ sysret_t sys_sigaction(int sig, const struct k_sigaction *act, struct lwp_sigaction kact, *pkact = RT_NULL; struct lwp_sigaction koact, *pkoact = RT_NULL; + /* Reject out-of-range signal numbers before indexing the action arrays. */ + if (sig <= 0 || (unsigned long)sig > _LWP_NSIG) + { + SET_ERRNO(EINVAL); + goto out; + } if (!sigsetsize) { SET_ERRNO(EINVAL);