From: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Date: Fri, 15 Jul 2022 06:07:40 +0000 (+0800)
Subject: target/loongarch/op_helper: Fix coverity cond_at_most error
X-Git-Tag: v7.1.0-rc0~11^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064357041d64331e3dbc18629d07abf88ce0f6bb;p=thirdparty%2Fqemu.git

target/loongarch/op_helper: Fix coverity cond_at_most error

The boundary size of cpucfg array should be 0 to ARRAY_SIZE(cpucfg)-1.
So, using index bigger than max boundary to access cpucfg[] must be
forbidden.

Fix coverity CID: 1489760

Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220715060740.1500628-6-yangxiaojuan@loongson.cn>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/loongarch/op_helper.c b/target/loongarch/op_helper.c
index 4b429b66999..568c0716016 100644
--- a/target/loongarch/op_helper.c
+++ b/target/loongarch/op_helper.c
@@ -81,7 +81,7 @@ target_ulong helper_crc32c(target_ulong val, target_ulong m, uint64_t sz)
 
 target_ulong helper_cpucfg(CPULoongArchState *env, target_ulong rj)
 {
-    return rj > 21 ? 0 : env->cpucfg[rj];
+    return rj >= ARRAY_SIZE(env->cpucfg) ? 0 : env->cpucfg[rj];
 }
 
 uint64_t helper_rdtime_d(CPULoongArchState *env)