You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/13 07:43:26 UTC
[incubator-nuttx] branch master updated: arch/assert: fix the stack dump overflow
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 89e2f00 arch/assert: fix the stack dump overflow
89e2f00 is described below
commit 89e2f00dadd70ecff3a4f490f8d04c87750b4a0d
Author: chao.an <an...@xiaomi.com>
AuthorDate: Thu Dec 2 17:44:49 2021 +0800
arch/assert: fix the stack dump overflow
[ EMERG] kasan_report: kasan detected a read access error, address at 0x3c24fca8, size is 4
[ EMERG] up_assert: Assertion failed at file:kasan/kasan.c line: 104 task: init
[ EMERG] backtrace|10: 0x2c334666 0x2c35f0d6 0x2c359ef6 0x2c35f830 0x2c360ed4 0x2c3615c0 0x2c324e0c 0x2c30a168
[ EMERG] up_registerdump: R0: ffffffff R1: 00000004 R2: ffffffff R3: ffffffff
[ EMERG] up_registerdump: R4: 3c20d4f0 R5: 2c35acd5 R6: 00000000 FP: 3c24fae8
[ EMERG] up_registerdump: R8: 3c20d504 SB: ffffffff SL: 2c413e7c R11: 2c411eb8
[ EMERG] up_registerdump: IP: 00000002 SP: 3c24fae8 LR: 00000003 PC: 2c35f0d6
[ EMERG] up_registerdump: xPSR: 61010000 BASEPRI: 000000e0 CONTROL: 00000004
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/arm/src/arm/arm_assert.c | 2 +-
arch/arm/src/armv6-m/arm_assert.c | 2 +-
arch/arm/src/armv7-a/arm_assert.c | 2 +-
arch/arm/src/armv7-m/arm_assert.c | 2 +-
arch/arm/src/armv7-r/arm_assert.c | 2 +-
arch/arm/src/armv8-m/arm_assert.c | 2 +-
arch/avr/src/avr/up_dumpstate.c | 2 +-
arch/avr/src/avr32/up_dumpstate.c | 2 +-
arch/hc/src/m9s12/m9s12_assert.c | 2 +-
arch/mips/src/mips32/mips_dumpstate.c | 2 +-
arch/misoc/src/lm32/lm32_dumpstate.c | 2 +-
arch/misoc/src/minerva/minerva_dumpstate.c | 2 +-
arch/or1k/src/common/up_assert.c | 2 +-
arch/risc-v/src/rv64gc/riscv_assert.c | 2 +-
arch/x86/src/common/up_assert.c | 2 +-
arch/x86_64/src/common/up_assert.c | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/src/arm/arm_assert.c b/arch/arm/src/arm/arm_assert.c
index fe6fa51..e2be7da 100644
--- a/arch/arm/src/arm/arm_assert.c
+++ b/arch/arm/src/arm/arm_assert.c
@@ -77,7 +77,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/arm/src/armv6-m/arm_assert.c b/arch/arm/src/armv6-m/arm_assert.c
index c89ec72..547ad5d 100644
--- a/arch/arm/src/armv6-m/arm_assert.c
+++ b/arch/arm/src/armv6-m/arm_assert.c
@@ -76,7 +76,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 2388c20..67bd0de 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -79,7 +79,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/arm/src/armv7-m/arm_assert.c b/arch/arm/src/armv7-m/arm_assert.c
index f2340b2..f0318ec 100644
--- a/arch/arm/src/armv7-m/arm_assert.c
+++ b/arch/arm/src/armv7-m/arm_assert.c
@@ -79,7 +79,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 7742c4d..05b1d7a 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -76,7 +76,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/arm/src/armv8-m/arm_assert.c b/arch/arm/src/armv8-m/arm_assert.c
index 6a43ede..30ef42d 100644
--- a/arch/arm/src/armv8-m/arm_assert.c
+++ b/arch/arm/src/armv8-m/arm_assert.c
@@ -79,7 +79,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index c246c55..aac8edd 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -51,7 +51,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_top)
{
uint16_t stack;
- for (stack = sp & ~3; stack < stack_top; stack += 12)
+ for (stack = sp & ~3; stack < (stack_top & ~0x1f); stack += 12)
{
uint8_t *ptr = (uint8_t *)stack;
_alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index c47b343..3384a85 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -51,7 +51,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 2717252..02b2531 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -76,7 +76,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_top)
{
uint16_t stack;
- for (stack = sp; stack < stack_top; stack += 16)
+ for (stack = sp; stack < (stack_top & ~0x1f); stack += 16)
{
uint8_t *ptr = (uint8_t *)stack;
diff --git a/arch/mips/src/mips32/mips_dumpstate.c b/arch/mips/src/mips32/mips_dumpstate.c
index 7abbde6..07bec63 100644
--- a/arch/mips/src/mips32/mips_dumpstate.c
+++ b/arch/mips/src/mips32/mips_dumpstate.c
@@ -52,7 +52,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08" PRIx32 ": %08" PRIx32 " %08" PRIx32
diff --git a/arch/misoc/src/lm32/lm32_dumpstate.c b/arch/misoc/src/lm32/lm32_dumpstate.c
index 06b3ab8..ec69734 100644
--- a/arch/misoc/src/lm32/lm32_dumpstate.c
+++ b/arch/misoc/src/lm32/lm32_dumpstate.c
@@ -50,7 +50,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/misoc/src/minerva/minerva_dumpstate.c b/arch/misoc/src/minerva/minerva_dumpstate.c
index 46f133c..d3fd061 100644
--- a/arch/misoc/src/minerva/minerva_dumpstate.c
+++ b/arch/misoc/src/minerva/minerva_dumpstate.c
@@ -50,7 +50,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *) stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/or1k/src/common/up_assert.c b/arch/or1k/src/common/up_assert.c
index 182c124..0b23927 100644
--- a/arch/or1k/src/common/up_assert.c
+++ b/arch/or1k/src/common/up_assert.c
@@ -75,7 +75,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/risc-v/src/rv64gc/riscv_assert.c b/arch/risc-v/src/rv64gc/riscv_assert.c
index a9d5768..f337a4f 100644
--- a/arch/risc-v/src/rv64gc/riscv_assert.c
+++ b/arch/risc-v/src/rv64gc/riscv_assert.c
@@ -75,7 +75,7 @@ static void up_stackdump(uint64_t sp, uintptr_t stack_top)
{
uintptr_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08" PRIxPTR ": %08" PRIx32 " %08" PRIx32 " %08" PRIx32
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 627fa1e..18ddacc 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -77,7 +77,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_top)
{
uint32_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
diff --git a/arch/x86_64/src/common/up_assert.c b/arch/x86_64/src/common/up_assert.c
index cce56be..eebca3e 100644
--- a/arch/x86_64/src/common/up_assert.c
+++ b/arch/x86_64/src/common/up_assert.c
@@ -69,7 +69,7 @@ static void up_stackdump(uint64_t sp, uint64_t stack_top)
{
uint64_t stack;
- for (stack = sp & ~0x1f; stack < stack_top; stack += 32)
+ for (stack = sp & ~0x1f; stack < (stack_top & ~0x1f); stack += 32)
{
uint32_t *ptr = (uint32_t *)stack;
_alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",