[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] target/mips: avoid integer overflow in next_p
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH 10/10] target/mips: avoid integer overflow in next_page PC check |
Date: |
Tue, 10 Apr 2018 12:19:46 -0400 |
If the PC is in the last page of the address space, next_page_start
overflows to 0. Fix it.
Cc: Aurelien Jarno <address@hidden>
Cc: Yongbok Kim <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
---
target/mips/translate.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/mips/translate.c b/target/mips/translate.c
index d05ee67..d8e717d 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -20202,14 +20202,14 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
CPUMIPSState *env = cs->env_ptr;
DisasContext ctx;
target_ulong pc_start;
- target_ulong next_page_start;
+ target_ulong page_start;
int num_insns;
int max_insns;
int insn_bytes;
int is_slot;
pc_start = tb->pc;
- next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ page_start = pc_start & TARGET_PAGE_MASK;
ctx.pc = pc_start;
ctx.saved_pc = -1;
ctx.singlestep_enabled = cs->singlestep_enabled;
@@ -20320,7 +20320,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
break;
}
- if (ctx.pc >= next_page_start) {
+ if (ctx.pc - page_start >= TARGET_PAGE_SIZE) {
break;
}
--
2.7.4
- [Qemu-devel] [PATCH 03/10] target/lm32: avoid integer overflow in next_page PC check, (continued)
- [Qemu-devel] [PATCH 03/10] target/lm32: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 07/10] target/microblaze: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 06/10] target/tilegx: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 08/10] target/arm: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 09/10] target/s390x: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 02/10] target/cris: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 10/10] target/mips: avoid integer overflow in next_page PC check,
Emilio G. Cota <=
- Re: [Qemu-devel] [PATCH 00/10] Avoid integer overflow in next_page_start, Richard Henderson, 2018/04/10