2012-10-28 18:05:07 +00:00
|
|
|
From 8057ac10e8cba3acb89c11c94f04967306e55a9f Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Stefan Weil <sw@weilnetz.de>
|
|
|
|
|
Date: Fri, 7 Sep 2012 22:36:08 +0200
|
|
|
|
|
Subject: [PATCH] target-cris: Fix buffer overflow
|
|
|
|
|
|
|
|
|
|
Report from smatch:
|
|
|
|
|
|
|
|
|
|
target-cris/translate.c:3464 cpu_dump_state(32) error:
|
|
|
|
|
buffer overflow 'env->sregs' 4 <= 255
|
|
|
|
|
|
|
|
|
|
sregs is declared 'uint32_t sregs[4][16]', so the first index must be
|
|
|
|
|
less than 4 or ARRAY_SIZE(env->sregs).
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
|
|
---
|
|
|
|
|
target-cris/translate.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/target-cris/translate.c b/target-cris/translate.c
|
|
|
|
|
index 1ad9ec7..ad31877 100644
|
|
|
|
|
--- a/target-cris/translate.c
|
|
|
|
|
+++ b/target-cris/translate.c
|
|
|
|
|
@@ -3458,7 +3458,7 @@ void cpu_dump_state (CPUCRISState *env, FILE *f, fprintf_function cpu_fprintf,
|
|
|
|
|
}
|
|
|
|
|
srs = env->pregs[PR_SRS];
|
|
|
|
|
cpu_fprintf(f, "\nsupport function regs bank %x:\n", srs);
|
|
|
|
|
- if (srs < 256) {
|
|
|
|
|
+ if (srs < ARRAY_SIZE(env->sregs)) {
|
|
|
|
|
for (i = 0; i < 16; i++) {
|
|
|
|
|
cpu_fprintf(f, "s%2.2d=%8.8x ",
|
|
|
|
|
i, env->sregs[srs][i]);
|
|
|
|
|
--
|
2012-12-16 23:27:22 +00:00
|
|
|
1.8.0.2
|
2012-10-28 18:05:07 +00:00
|
|
|
|
