OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arm64_checkstack: fix crash, optimize the stack color, sync with arm 

Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
Bowen Wang 2024-02-29 16:34:53 +08:00 committed by Xiang Xiao
parent 3054b1ad51
commit f172f222be
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm64/src/common/arm64_checkstack.c
View File

@ -160,12 +160,24 @@ void arm64_stack_color(void *stackbase, size_t nbytes)
uintptr_t end; uintptr_t end;
size_t nwords; size_t nwords;
uint32_t *ptr; uint32_t *ptr;
uintptr_t sp;
/* Take extra care that we do not write outside the stack boundaries */ /* Take extra care that we do not write outside the stack boundaries */
start = STACK_ALIGN_UP((uintptr_t)stackbase); start = (uintptr_t)STACK_ALIGN_UP((uintptr_t)stackbase);
end = nbytes ? STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes) :
up_getsp(); /* 0: colorize the running stack */ if (nbytes == 0) /* 0: colorize the running stack */
{
end = up_getsp();
if (end > (uintptr_t)&sp)
{
end = (uintptr_t)&sp;
}
}
else
{
end = (uintptr_t)stackbase + nbytes;
}
/* Get the adjusted size based on the top and bottom of the stack */ /* Get the adjusted size based on the top and bottom of the stack */