From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PULL v2 8/9] target/i386: Make sure that vsyscall's tb->size != 0
Date: Thu, 20 May 2021 19:05:18 +0200 [thread overview]
Message-ID: <20210520170519.300951-9-cohuck@redhat.com> (raw)
In-Reply-To: <20210520170519.300951-1-cohuck@redhat.com>
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
next prev parent reply other threads:[~2021-05-20 17:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 17:05 [PULL v2 0/9] s390x update Cornelia Huck
2021-05-20 17:05 ` [PULL v2 1/9] target/s390x: Fix translation exception on illegal instruction Cornelia Huck
2021-05-20 17:05 ` [PULL v2 2/9] target/arm: Make sure that commpage's tb->size != 0 Cornelia Huck
2021-05-20 17:05 ` [PULL v2 3/9] target/xtensa: Make sure that " Cornelia Huck
2021-05-20 17:05 ` [PULL v2 4/9] accel/tcg: Assert that tb->size != 0 after translation Cornelia Huck
2021-05-20 17:05 ` [PULL v2 5/9] vfio-ccw: Permit missing IRQs Cornelia Huck
2021-05-20 17:05 ` [PULL v2 6/9] hw/s390x/ccw: Register qbus type in abstract TYPE_CCW_DEVICE parent Cornelia Huck
2021-05-20 17:05 ` [PULL v2 7/9] vfio-ccw: Attempt to clean up all IRQs on error Cornelia Huck
2021-05-20 17:05 ` Cornelia Huck [this message]
2021-05-20 17:05 ` [PULL v2 9/9] tests/tcg/x86_64: add vsyscall smoke test Cornelia Huck
2021-05-20 19:11 ` [PULL v2 0/9] s390x update Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210520170519.300951-9-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=iii@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).