riscv/trap: fix sp restore logic

This fixes stack pointer restore logic to avoid parent stack corruption by forked child in PROTECTED build. Signed-off-by: Yanfeng Liu <[email protected]>
apache · Jul 24, 2024 · 59bfed0 · 59bfed0
1 parent 32d4131
commit 59bfed0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/arch/risc-v/src/common/riscv_exception_common.S b/arch/risc-v/src/common/riscv_exception_common.S
@@ -231,7 +231,11 @@ return_from_exception:
 
   load_ctx   sp
 
+#ifdef CONFIG_ARCH_KERNEL_STACK
   REGLOAD    sp, REG_SP(sp)      /* restore original sp */
+#else
+  addi       sp, sp, XCPTCONTEXT_SIZE
+#endif
 
   /* Return from exception */