[100742/100742] target/arm: Adding a check for the result of calling the CPU information check function

Commit Message

Миронов Сергей Владимирович Oct. 12, 2023, 8:50 a.m. UTC

6 out of 7 calls to get_arm_cp_reginfo() are checked

Signed-off-by: Sergey Mironov <[e-mail]>
---
 target/arm/helper.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Philippe Mathieu-Daudé Oct. 12, 2023, 8:52 a.m. UTC | #1

Hi Sergey,

On 12/10/23 10:50, Sergey Mironov wrote:
> 6 out of 7 calls to get_arm_cp_reginfo() are checked
> 
> Signed-off-by: Sergey Mironov <[e-mail]>
> ---
>   target/arm/helper.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index 74fbb6e1d7..cffbbaf571 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -198,6 +198,7 @@ static void add_cpreg_to_list(gpointer key, gpointer opaque)
>       uint32_t regidx = (uintptr_t)key;
>       const ARMCPRegInfo *ri = get_arm_cp_reginfo(cpu->cp_regs, regidx);
>   
> +    assert(ri != NULL);
>       if (!(ri->type & (ARM_CP_NO_RAW | ARM_CP_ALIAS))) {
>           cpu->cpreg_indexes[cpu->cpreg_array_len] = cpreg_to_kvm_id(regidx);
>           /* The value array need not be initialized at this point */

100742 patches would be the biggest series I ever saw on this list =)

Миронов Сергей Владимирович Oct. 12, 2023, 8:58 a.m. UTC | #2

It was my mistake :)

Patch

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 74fbb6e1d7..cffbbaf571 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -198,6 +198,7 @@  static void add_cpreg_to_list(gpointer key, gpointer opaque)
     uint32_t regidx = (uintptr_t)key;
     const ARMCPRegInfo *ri = get_arm_cp_reginfo(cpu->cp_regs, regidx);
 
+    assert(ri != NULL);
     if (!(ri->type & (ARM_CP_NO_RAW | ARM_CP_ALIAS))) {
         cpu->cpreg_indexes[cpu->cpreg_array_len] = cpreg_to_kvm_id(regidx);
         /* The value array need not be initialized at this point */