[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 09/28] target/s390x: avoid integer overflow in next_p
From: |
Richard Henderson |
Subject: |
[qemu-s390x] [PULL 09/28] target/s390x: avoid integer overflow in next_page PC check |
Date: |
Wed, 9 May 2018 10:54:39 -0700 |
From: "Emilio G. Cota" <address@hidden>
If the PC is in the last page of the address space, next_page_start
overflows to 0. Fix it.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: David Hildenbrand <address@hidden>
Cc: address@hidden
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/translate.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 7d39ab350d..44449f11ab 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -6163,7 +6163,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
CPUS390XState *env = cs->env_ptr;
DisasContext dc;
target_ulong pc_start;
- uint64_t next_page_start;
+ uint64_t page_start;
int num_insns, max_insns;
ExitStatus status;
bool do_debug;
@@ -6181,7 +6181,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
dc.ex_value = tb->cs_base;
do_debug = dc.singlestep_enabled = cs->singlestep_enabled;
- next_page_start = (pc_start & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
+ page_start = pc_start & TARGET_PAGE_MASK;
num_insns = 0;
max_insns = tb_cflags(tb) & CF_COUNT_MASK;
@@ -6218,7 +6218,7 @@ void gen_intermediate_code(CPUState *cs, struct
TranslationBlock *tb)
/* If we reach a page boundary, are single stepping,
or exhaust instruction count, stop generation. */
if (status == NO_EXIT
- && (dc.pc >= next_page_start
+ && (dc.pc - page_start >= TARGET_PAGE_SIZE
|| tcg_op_buf_full()
|| num_insns >= max_insns
|| singlestep
--
2.17.0
- [qemu-s390x] [PULL 00/28] Bulk target patches, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 01/28] target/riscv: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 02/28] target/cris: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 03/28] target/lm32: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 04/28] target/xtensa: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 06/28] target/tilegx: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 05/28] target/unicore32: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 07/28] target/microblaze: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 09/28] target/s390x: avoid integer overflow in next_page PC check,
Richard Henderson <=
- [qemu-s390x] [PULL 08/28] target/arm: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 10/28] target/mips: avoid integer overflow in next_page PC check, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 11/28] translator: merge max_insns into DisasContextBase, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 12/28] target/sh4: convert to TranslatorOps, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 13/28] target/sparc: convert to DisasJumpType, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 16/28] target/mips: use lookup_and_goto_ptr on BS_STOP, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 14/28] target/sparc: convert to DisasContextBase, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 15/28] target/sparc: convert to TranslatorOps, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 19/28] target/mips: use *ctx for DisasContext, Richard Henderson, 2018/05/09
- [qemu-s390x] [PULL 20/28] target/mips: convert to TranslatorOps, Richard Henderson, 2018/05/09