[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] target/xtensa: avoid integer overflow in next
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [PATCH 04/10] target/xtensa: avoid integer overflow in next_page PC check |
Date: |
Tue, 10 Apr 2018 12:19:40 -0400 |
If the PC is in the last page of the address space, next_page_start
overflows to 0. Fix it.
Cc: Max Filippov <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
---
target/xtensa/translate.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 4f6d030..aad4963 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -1061,8 +1061,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock
*tb)
int insn_count = 0;
int max_insns = tb_cflags(tb) & CF_COUNT_MASK;
uint32_t pc_start = tb->pc;
- uint32_t next_page_start =
- (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ uint32_t page_start = pc_start & TARGET_PAGE_MASK;
if (max_insns == 0) {
max_insns = CF_COUNT_MASK;
@@ -1162,9 +1161,9 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock
*tb)
}
} while (dc.is_jmp == DISAS_NEXT &&
insn_count < max_insns &&
- dc.pc < next_page_start &&
- dc.pc + xtensa_insn_len(env, &dc) <= next_page_start &&
- !tcg_op_buf_full());
+ dc.pc - page_start < TARGET_PAGE_SIZE &&
+ dc.pc - page_start + xtensa_insn_len(env, &dc) <= TARGET_PAGE_SIZE
+ && !tcg_op_buf_full());
done:
reset_sar_tracker(&dc);
if (dc.icount) {
--
2.7.4
- [Qemu-devel] [PATCH 00/10] Avoid integer overflow in next_page_start, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 04/10] target/xtensa: avoid integer overflow in next_page PC check,
Emilio G. Cota <=
- [Qemu-devel] [PATCH 05/10] target/unicore32: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [Qemu-devel] [PATCH 01/10] target/riscv: avoid integer overflow in next_page PC check, Emilio G. Cota, 2018/04/10
- [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