[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/4] target/xtensa: Correct assert condition in handle_interrupt()
|
From: |
Peter Maydell |
|
Subject: |
[PULL 4/4] target/xtensa: Correct assert condition in handle_interrupt() |
|
Date: |
Thu, 1 Aug 2024 15:23:22 +0100 |
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
---
target/xtensa/exc_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c
index 0514c2c1f32..ca629f071d1 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];
--
2.34.1
- [PULL 0/4] target-arm queue, Peter Maydell, 2024/08/01
- [PULL 0/4] target-arm queue, Peter Maydell, 2024/08/13
- [PULL 1/4] hw/misc/stm32l4x5_rcc: Add validation for MCOPRE and MCOSEL values, Peter Maydell, 2024/08/13
- [PULL 2/4] target/arm: Clear high SVE elements in handle_vec_simd_wshli, Peter Maydell, 2024/08/13
- [PULL 3/4] target/arm: Update translation regime comment for new features, Peter Maydell, 2024/08/13
- [PULL 4/4] target/arm: Fix usage of MMU indexes when EL3 is AArch32, Peter Maydell, 2024/08/13
- Re: [PULL 0/4] target-arm queue, Richard Henderson, 2024/08/13