[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 8/9] target/i386: Make sure that vsyscall's tb->size != 0
From: |
Cornelia Huck |
Subject: |
[PULL v2 8/9] target/i386: Make sure that vsyscall's tb->size != 0 |
Date: |
Thu, 20 May 2021 19:05:18 +0200 |
From: Ilya Leoshkevich <iii@linux.ibm.com>
tb_gen_code() assumes that tb->size must never be zero, otherwise it
may produce spurious exceptions. For x86_64 this may happen when
creating a translation block for the vsyscall page.
Fix by pretending that vsyscall translation blocks have at least one
instruction.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210519045738.1335210-2-iii@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
target/i386/tcg/translate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index db56a483435d..3ab8c2385560 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -8583,6 +8583,7 @@ static void i386_tr_translate_insn(DisasContextBase
*dcbase, CPUState *cpu)
*/
if ((dc->base.pc_next & TARGET_PAGE_MASK) == TARGET_VSYSCALL_PAGE) {
gen_exception(dc, EXCP_VSYSCALL, dc->base.pc_next);
+ dc->base.pc_next = dc->pc + 1;
return;
}
#endif
--
2.31.1
- [PULL v2 0/9] s390x update, Cornelia Huck, 2021/05/20
- [PULL v2 1/9] target/s390x: Fix translation exception on illegal instruction, Cornelia Huck, 2021/05/20
- [PULL v2 2/9] target/arm: Make sure that commpage's tb->size != 0, Cornelia Huck, 2021/05/20
- [PULL v2 3/9] target/xtensa: Make sure that tb->size != 0, Cornelia Huck, 2021/05/20
- [PULL v2 4/9] accel/tcg: Assert that tb->size != 0 after translation, Cornelia Huck, 2021/05/20
- [PULL v2 6/9] hw/s390x/ccw: Register qbus type in abstract TYPE_CCW_DEVICE parent, Cornelia Huck, 2021/05/20
- [PULL v2 5/9] vfio-ccw: Permit missing IRQs, Cornelia Huck, 2021/05/20
- [PULL v2 7/9] vfio-ccw: Attempt to clean up all IRQs on error, Cornelia Huck, 2021/05/20
- [PULL v2 9/9] tests/tcg/x86_64: add vsyscall smoke test, Cornelia Huck, 2021/05/20
- [PULL v2 8/9] target/i386: Make sure that vsyscall's tb->size != 0,
Cornelia Huck <=
- Re: [PULL v2 0/9] s390x update, Peter Maydell, 2021/05/20