* [PATCH] target/xtensa: Correct assert condition in handle_interrupt()
@ 2024-07-31 17:22 Peter Maydell
2024-07-31 17:41 ` Max Filippov
2024-07-31 21:10 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2024-07-31 17:22 UTC (permalink / raw)
To: qemu-devel; +Cc: Max Filippov
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>
---
Spotted because Coverity (correctly) thought the issue was still
outstanding.
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] target/xtensa: Correct assert condition in handle_interrupt()
2024-07-31 17:22 [PATCH] target/xtensa: Correct assert condition in handle_interrupt() Peter Maydell
@ 2024-07-31 17:41 ` Max Filippov
2024-07-31 21:10 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Max Filippov @ 2024-07-31 17:41 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
On Wed, Jul 31, 2024 at 10:22 AM Peter Maydell <peter.maydell@linaro.org> wrote:
>
> 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>
> ---
> Spotted because Coverity (correctly) thought the issue was still
> outstanding.
> ---
> target/xtensa/exc_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] target/xtensa: Correct assert condition in handle_interrupt()
2024-07-31 17:22 [PATCH] target/xtensa: Correct assert condition in handle_interrupt() Peter Maydell
2024-07-31 17:41 ` Max Filippov
@ 2024-07-31 21:10 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-07-31 21:10 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Max Filippov
On 31/7/24 19:22, Peter Maydell wrote:
> 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>
> ---
> Spotted because Coverity (correctly) thought the issue was still
> outstanding.
> ---
> target/xtensa/exc_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-31 21:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-31 17:22 [PATCH] target/xtensa: Correct assert condition in handle_interrupt() Peter Maydell
2024-07-31 17:41 ` Max Filippov
2024-07-31 21:10 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).