luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

risc-v/assert: add CURRENT_REGS check to avoid null pointer reference

Browse source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-01-14 23:16:38 +08:00 • committed by Xiang Xiao
parent c27839f98e
commit 3544fc1fd6
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/risc-v/src/common/riscv_assert.c
View file

@ -29,6 +29,8 @@
#include <assert.h>
#include <debug.h>
#include <syscall.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
@ -313,9 +315,21 @@ static void riscv_dumpstate(void)
sched_dumpstack(rtcb->pid);
#endif
/* Update the xcp context */
if (CURRENT_REGS)
{
memcpy(rtcb->xcp.regs,
(uintptr_t *)CURRENT_REGS, XCPTCONTEXT_REGS);
}
else
{
riscv_saveusercontext(rtcb->xcp.regs);
}
/* Dump the registers (if available) */
riscv_registerdump((volatile uintptr_t *)CURRENT_REGS);
riscv_registerdump(rtcb->xcp.regs);
/* Get the limits on the user stack memory */
@ -347,7 +361,11 @@ static void riscv_dumpstate(void)
/* Extract the user stack pointer */
sp = CURRENT_REGS[REG_SP];
if (CURRENT_REGS)
{
sp = CURRENT_REGS[REG_SP];
}
_alert("sp: %" PRIxREG "\n", sp);
}
else if (CURRENT_REGS)