Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

checkstack: fix access overflow when checkstack

Browse source 
We should check length first, and then check the value

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2025-09-11 18:28:57 +08:00 • committed by Alan C. Assis
parent 3c6cb0b76e
commit 113bb02568
11 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/src/common/arm_checkstack.c
View file

@ -119,7 +119,7 @@ size_t arm_stack_check(void *stackbase, size_t nbytes)
*/
for (ptr = (uint32_t *)start, mark = (nbytes >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/arm64/src/common/arm64_checkstack.c
View file

@ -101,7 +101,7 @@ size_t arm64_stack_check(void *stackbase, size_t nbytes)
*/
for (ptr = (uint32_t *)start, mark = (nbytes >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/avr/src/avr/avr_checkstack.c
View file

@ -108,7 +108,7 @@ size_t avr_stack_check(uintptr_t alloc, size_t size)
*/
for (ptr = (FAR uint8_t *)alloc, mark = size;
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/ceva/src/common/ceva_checkstack.c
View file

@ -100,7 +100,7 @@ size_t ceva_stack_check(uintptr_t alloc, size_t size)
*/
for (ptr = (uint32_t *)alloc, mark = nwords;
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/or1k/src/common/or1k_checkstack.c
View file

@ -115,7 +115,7 @@ size_t or1k_stack_check(uintptr_t alloc, size_t size)
size = end - start;
for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* Return our guess about how much stack space was used */

2
arch/risc-v/src/common/riscv_checkstack.c
View file

@ -117,7 +117,7 @@ size_t riscv_stack_check(uintptr_t alloc, size_t size)
*/
for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/sim/src/sim/sim_checkstack.c
View file

@ -91,7 +91,7 @@ size_t sim_stack_check(void *alloc, size_t size)
*/
for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/sparc/src/common/sparc_checkstack.c
View file

@ -115,7 +115,7 @@ size_t sparc_stack_check(void *stackbase, size_t nbytes)
*/
for (ptr = (uint32_t *)start, mark = (nbytes >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack

2
arch/tricore/src/common/tricore_checkstack.c
View file

@ -93,7 +93,7 @@ size_t tricore_stack_check(uintptr_t alloc, size_t size)
*/
for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* Return our guess about how much stack space was used */

2
arch/x86_64/src/intel64/intel64_checkstack.c
View file

@ -86,7 +86,7 @@ size_t x86_64_stack_check(void *stackbase, size_t nbytes)
*/
for (ptr = (uint32_t *)start, mark = (nbytes >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* Return our guess about how much stack space was used */

2
arch/xtensa/src/common/xtensa_checkstack.c
View file

@ -116,7 +116,7 @@ size_t xtensa_stack_check(uintptr_t alloc, size_t size)
*/
for (ptr = (uint32_t *)start, mark = (size >> 2);
*ptr == STACK_COLOR && mark > 0;
mark > 0 && *ptr == STACK_COLOR;
ptr++, mark--);
/* If the stack is completely used, then this might mean that the stack