target/microblaze: Fix possible array out of bounds in mmu_write()
PATCH 1/1 target/microblaze: Fix possible array out of bounds in mmu_write()
The size of env->mmu.regs is 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX].
--- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/microblaze/mmu.c +2 -1
@@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x old=%x\n" , __func__, rn, v, + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);if (cpu->cfg.mmu <2 || !cpu->cfg.mmu_tlb_access) {qemu_log_mask (LOG_GUEST_ERROR ,"MMU access on MMU-less system\n" );
Signature · 1 line
2.19.1
Quoted 4 lines · AlexChen
The size of
env->mmu.regsis 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX].
... since env->mmu.regs[MMU_R_TLBX] is used in the other cases in this function. Makes sense, indeed.
Quoted 12 lines
Reported-by Euler Robot <[email protected]>Signed-off-by Alex Chen <[email protected]>--- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/microblaze/mmu.c +0
-0
target/microblaze/mmu.c void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v) · line 241
Quoted 9 lines
target/microblaze/mmu.c +2
-1@@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x old=%x\n" , __func__, rn, v, + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);if (cpu->cfg.mmu <2 || !cpu->cfg.mmu_tlb_access) {qemu_log_mask (LOG_GUEST_ERROR ,"MMU access on MMU-less system\n" );
Quoted 7 lines · AlexChen
The size of
env->mmu.regsis 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX].Reported-by Euler Robot <[email protected]>Signed-off-by Alex Chen <[email protected]>
Quoted 20 lines
--- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/microblaze/mmu.c +2
-1@@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x old=%x\n" , __func__, rn, v, + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);if (cpu->cfg.mmu <2 || !cpu->cfg.mmu_tlb_access) {qemu_log_mask (LOG_GUEST_ERROR ,"MMU access on MMU-less system\n" );Signature · 1 line
2.19.1
Quoted 16 lines · AlexChen
The size of
env->mmu.regsis 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX].Reported-by Euler Robot <[email protected]>Signed-off-by Alex Chen <[email protected]>--- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/microblaze/mmu.c +0
-0
target/microblaze/mmu.c void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v) · line 238
Quoted 6 lines
target/microblaze/mmu.c +2
-1@@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x old=%x\n" , __func__, rn, v, + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);
Nack. If rn >= ARRAY_SIZE(env->mmu.regs), then don't displays it. Else it is confuse to see a value unrelated to the MMU index used...
Quoted 4 lines
target/microblaze/mmu.c +0
-0if (cpu->cfg.mmu <2 || !cpu->cfg.mmu_tlb_access) {qemu_log_mask (LOG_GUEST_ERROR ,"MMU access on MMU-less system\n" );
Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 18 lines · AlexChen
The size of
env->mmu.regsis 3, but the range of 'rn' is [0, 5]. To avoid data access out of bounds, only if 'rn' is less than 3, we can print env->mmu.regs[rn]. In other cases, we can print env->mmu.regs[MMU_R_TLBX].Reported-by Euler Robot <[email protected]>Signed-off-by Alex Chen <[email protected]>--- target/microblaze/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/microblaze/mmu.c +0
-0@@ -234,7 +234,8 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;
Quoted 8 lines
target/microblaze/mmu.c void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v) · line 238
Quoted 4 lines
target/microblaze/mmu.c +2
-1qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x old=%x\n" , __func__, rn, v, + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);Nack. If rn >=
ARRAY_SIZE(env->mmu.regs), then don't displays it. Else it is confuse to see a value unrelated to the MMU index used...
Hi Philippe,
Thanks for your review.
The env->mmu.regs[MMU_R_TLBX] is used when rn >= ARRAY_SIZE(env->mmu.regs), can we change the description of the log as follows so that it doesn't confuse us?
--- target/microblaze/mmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/microblaze/mmu.c +3 -1
@@ -234,7 +234,9 @@ void mmu_write(CPUMBState *env, bool ext, uint32_t rn, uint32_t v)unsigned int i;qemu_log_mask (CPU_LOG_MMU , -"%s rn=%d=%x old=%x\n" , __func__, rn, v, env->mmu.regs[rn]); +"%s rn=%d=%x %s=%x\n" , __func__, rn, v, + rn <3 ?"old" :"regs[MMU_R_TLBX]" , + rn <3 ? env->mmu.regs[rn] : env->mmu.regs[MMU_R_TLBX ]);if (cpu->cfg.mmu <2 || !cpu->cfg.mmu_tlb_access) {qemu_log_mask (LOG_GUEST_ERROR ,"MMU access on MMU-less system\n" );
Thanks,
Alex