This is an automated email from the ASF dual-hosted git repository.
xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new b2277c0dead arm: fix unwind to invalid addresses in signal
b2277c0dead is described below
commit b2277c0deade5f053af917dc2c5ee3cf01c7beec
Author: xuxingliang <[email protected]>
AuthorDate: Fri Oct 17 15:51:19 2025 +0800
arm: fix unwind to invalid addresses in signal
Clear the LR register value, to avoid unwinding to invalid addresses.
Note the invalid data in unwind result.
(gdb) f 12
(gdb) x/16a buffer
0x43158a4c: 0x6e9222 <backtrace_unwind+566> 0x63ac6e
<backtrace_record+30> 0x6394aa <nxrmutex_lock+78> 0x637b86
<pipecommon_read+78>
0x43158a5c: 0x68fa18 <file_readv+212> 0x68fade <read+78>
0x72c494 <uv__signal_handler+84> 0x60ebc2 <nxsig_deliver+482>
0x43158a6c: 0x6505d2 <arm_sigdeliver+78> 0x6cf02a
<nxsem_wait_slow+1018> 0x55555552 0x0
0x43158a7c: 0x1d97e64 <__stack_chk_guard> 0x42e13818 0x0
0x7ffffffe
(gdb)
(gdb) bt
#7 _assert (filename=filename@entry=0x1b42c50 "armv7-a/arm_dataabort.c",
linenum=linenum@entry=172, msg=msg@entry=0x1bffe04 "panic", regs=0x40275c30
<g_last_regs>, regs@entry=0x431587a0, irq=irq@entry=true) at misc/assert.c:952
#8 0x0060071e in arm_dataabort (regs=0x431587a0, dfar=3256916992,
dfsr=<optimized out>) at armv7-a/arm_dataabort.c:172
#9 0x00600188 in arm_vectordata () at armv7-a/arm_vectors.S:453
#10 0x006e8984 in unwind_frame (frame=0x431584f0, frame@entry=0x431589d8)
at common/arm_backtrace_unwind.c:568
#11 0x006e9056 in backtrace_unwind (frame=0x431589d8,
frame@entry=0x431589e8, buffer=buffer@entry=0x43158a4c, size=size@entry=16,
skip=0x431589d4, skip@entry=0x431589e4) at common/arm_backtrace_unwind.c:652
#12 0x006e9338 in up_backtrace (tcb=<optimized out>,
buffer=buffer@entry=0x43158a4c, size=size@entry=16, skip=<optimized out>,
skip@entry=0) at common/arm_backtrace_unwind.c:768
#13 0x006ceafe in sched_backtrace (tid=<optimized out>,
buffer=buffer@entry=0x43158a4c, size=size@entry=16, skip=skip@entry=0) at
sched/sched_backtrace.c:106
...
#28 0x006505d4 in arm_sigdeliver () at armv7-a/arm_sigdeliver.c:77
#29 0x006cf02c in nxsched_add_prioritized (list=0x42dd7bd4,
tcb=0x42e13818) at
/home/work/ssd1/workspace/Vela-qemu-smartspeaker-trunk-25rc04-CI/nuttx/sched/sched/sched.h:532
#30 nxsem_wait_slow (sem=0x42dd7bcc) at semaphore/sem_wait.c:233
#31 0x55555554 in ?? ()
Backtrace stopped: previous frame identical to this frame (corrupt stack?)
(gdb)
After modification:
Unwind in signal callback:
nsh> kill -10 3
nsh> sched_dumpstack: backtrace:
sched_dumpstack: [ 3] [<0x1b0f6>] backtrace_unwind+0x157/0x15a
sched_dumpstack: [ 3] [<0xb262>] sched_backtrace+0x39/0x88
sched_dumpstack: [ 3] [<0x6e3e>] sched_dumpstack+0x19/0x98
sched_dumpstack: [ 3] [<0x37850>] siguser_action+0x13/0x20
sched_dumpstack: [ 3] [<0x17a46>] nxsig_deliver+0x103/0x204
sched_dumpstack: [ 3] [<0x1986>] arm_sigdeliver+0x3d/0xa4
nsh>
Signed-off-by: xuxingliang <[email protected]>
---
arch/arm/src/arm/arm_schedulesigaction.c | 1 +
arch/arm/src/armv6-m/arm_schedulesigaction.c | 2 ++
arch/arm/src/armv7-a/arm_schedulesigaction.c | 1 +
arch/arm/src/armv7-m/arm_schedulesigaction.c | 2 ++
arch/arm/src/armv7-r/arm_schedulesigaction.c | 1 +
arch/arm/src/armv8-m/arm_schedulesigaction.c | 3 +++
arch/arm/src/armv8-r/arm_schedulesigaction.c | 1 +
7 files changed, 11 insertions(+)
diff --git a/arch/arm/src/arm/arm_schedulesigaction.c
b/arch/arm/src/arm/arm_schedulesigaction.c
index 3a35acfed54..64948790833 100644
--- a/arch/arm/src/arm/arm_schedulesigaction.c
+++ b/arch/arm/src/arm/arm_schedulesigaction.c
@@ -108,6 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb)
* disabled
*/
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver;
tcb->xcp.regs[REG_CPSR] = PSR_MODE_SYS | PSR_I_BIT | PSR_F_BIT;
#ifdef CONFIG_ARM_THUMB
diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c
b/arch/arm/src/armv6-m/arm_schedulesigaction.c
index 69cb9bd5c73..121cba84a07 100644
--- a/arch/arm/src/armv6-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv6-m/arm_schedulesigaction.c
@@ -139,6 +139,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
tcb->xcp.regs[REG_LR] = EXC_RETURN_THREAD;
tcb->xcp.regs[REG_EXC_RETURN] = EXC_RETURN_THREAD;
tcb->xcp.regs[REG_CONTROL] = getcontrol() & ~CONTROL_NPRIV;
+#else
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
#endif
}
}
diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c
b/arch/arm/src/armv7-a/arm_schedulesigaction.c
index e5fa5ce4095..d36ab2f89a9 100644
--- a/arch/arm/src/armv7-a/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-a/arm_schedulesigaction.c
@@ -110,6 +110,7 @@ void up_schedule_sigaction(struct tcb_s *tcb)
* disabled
*/
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver;
tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SYS | PSR_I_BIT | PSR_F_BIT);
#ifdef CONFIG_ARM_THUMB
diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c
b/arch/arm/src/armv7-m/arm_schedulesigaction.c
index 75e8783ff25..b6ccfccd260 100644
--- a/arch/arm/src/armv7-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-m/arm_schedulesigaction.c
@@ -140,6 +140,8 @@ void up_schedule_sigaction(struct tcb_s *tcb)
tcb->xcp.regs[REG_LR] = EXC_RETURN_THREAD;
tcb->xcp.regs[REG_EXC_RETURN] = EXC_RETURN_THREAD;
tcb->xcp.regs[REG_CONTROL] = getcontrol() & ~CONTROL_NPRIV;
+#else
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
#endif
}
}
diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c
b/arch/arm/src/armv7-r/arm_schedulesigaction.c
index 2fc4a4b24a0..304a5030b54 100644
--- a/arch/arm/src/armv7-r/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-r/arm_schedulesigaction.c
@@ -108,6 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb)
* disabled
*/
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver;
tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SYS | PSR_I_BIT | PSR_F_BIT);
#ifdef CONFIG_ARM_THUMB
diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c
b/arch/arm/src/armv8-m/arm_schedulesigaction.c
index 9217dd54e2d..5f7a18488b9 100644
--- a/arch/arm/src/armv8-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c
@@ -146,6 +146,9 @@ void up_schedule_sigaction(struct tcb_s *tcb)
tcb->xcp.regs[REG_EXC_RETURN] = EXC_RETURN_THREAD;
tcb->xcp.regs[REG_CONTROL] = (getcontrol() & ~CONTROL_NPRIV) |
CONTROL_PACBTI_MASK;
+ tcb->xcp.regs[REG_CONTROL] = getcontrol() & ~CONTROL_NPRIV;
+#else
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
#endif
}
}
diff --git a/arch/arm/src/armv8-r/arm_schedulesigaction.c
b/arch/arm/src/armv8-r/arm_schedulesigaction.c
index 56b6d63c66f..830a969b962 100644
--- a/arch/arm/src/armv8-r/arm_schedulesigaction.c
+++ b/arch/arm/src/armv8-r/arm_schedulesigaction.c
@@ -108,6 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb)
* disabled
*/
+ tcb->xcp.regs[REG_LR] = 0; /* Avoid backtracing back. */
tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver;
tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SYS | PSR_I_BIT | PSR_F_BIT);
#ifdef CONFIG_ARM_THUMB