summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-07-31 18:22:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2024-08-01 10:59:01 +0100
commit5e8e4f098d872818aa9a138a171200068b81c8d1 (patch)
tree47e9575673b794170f0522301c02942846fe6fae
parent55f9f4ee018c5ccea81d8c8c586756d7711ae46f (diff)
downloadfocaccia-qemu-5e8e4f098d872818aa9a138a171200068b81c8d1.tar.gz
focaccia-qemu-5e8e4f098d872818aa9a138a171200068b81c8d1.zip
target/xtensa: Correct assert condition in handle_interrupt()
In commit ad18376b90c8101 we added an assert that the level value was
in-bounds for the array we're about to index into.  However, the
assert condition is wrong -- env->config->interrupt_vector is an
array of uint32_t, so we should bounds check the index against
ARRAY_SIZE(...), not against sizeof().

Resolves: Coverity CID 1507131
Fixes: ad18376b90c8101 ("target/xtensa: Assert that interrupt level is within bounds")
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240731172246.3682311-1-peter.maydell@linaro.org
Diffstat (limited to '')
-rw-r--r--target/xtensa/exc_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c
index 0514c2c1f3..ca629f071d 100644
--- a/target/xtensa/exc_helper.c
+++ b/target/xtensa/exc_helper.c
@@ -171,7 +171,7 @@ static void handle_interrupt(CPUXtensaState *env)
 
         if (level > 1) {
             /* env->config->nlevel check should have ensured this */
-            assert(level < sizeof(env->config->interrupt_vector));
+            assert(level < ARRAY_SIZE(env->config->interrupt_vector));
 
             env->sregs[EPC1 + level - 1] = env->pc;
             env->sregs[EPS2 + level - 2] = env->sregs[PS];