From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 02/12] target/i386: Verify memory operand for lcall and ljmp
Date: Thu, 1 Apr 2021 13:22:13 +0200 [thread overview]
Message-ID: <20210401112223.55711-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com>
From: Richard Henderson <richard.henderson@linaro.org>
These two opcodes only allow a memory operand.
Lacking the check for a register operand, we used the A0 temp
without initialization, which led to a tcg abort.
Buglink: https://bugs.launchpad.net/qemu/+bug/1921138
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210324164650.128608-1-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/tcg/translate.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index af1faf9342..880bc45561 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -5061,6 +5061,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
gen_jr(s, s->T0);
break;
case 3: /* lcall Ev */
+ if (mod == 3) {
+ goto illegal_op;
+ }
gen_op_ld_v(s, ot, s->T1, s->A0);
gen_add_A0_im(s, 1 << ot);
gen_op_ld_v(s, MO_16, s->T0, s->A0);
@@ -5088,6 +5091,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
gen_jr(s, s->T0);
break;
case 5: /* ljmp Ev */
+ if (mod == 3) {
+ goto illegal_op;
+ }
gen_op_ld_v(s, ot, s->T1, s->A0);
gen_add_A0_im(s, 1 << ot);
gen_op_ld_v(s, MO_16, s->T0, s->A0);
--
2.30.1
next prev parent reply other threads:[~2021-04-01 11:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 11:22 [PULL 00/12] Misc patches for QEMU 6.0-rc2 Paolo Bonzini
2021-04-01 11:22 ` [PULL 01/12] meson: Propagate gnutls dependency to migration Paolo Bonzini
2021-04-01 11:22 ` Paolo Bonzini [this message]
2021-04-01 11:22 ` [PULL 03/12] qapi: qom: do not use target-specific conditionals Paolo Bonzini
2021-04-01 11:22 ` [PULL 04/12] replay: fix recursive checkpoints Paolo Bonzini
2021-04-01 11:22 ` [PULL 05/12] Revert "qom: use qemu_printf to print help for user-creatable objects" Paolo Bonzini
2021-04-01 11:22 ` [PULL 06/12] icount: get rid of static variable Paolo Bonzini
2021-04-01 11:22 ` [PULL 07/12] replay: notify CPU on event Paolo Bonzini
2021-04-01 11:22 ` [PULL 08/12] target/openrisc: fix icount handling for timer instructions Paolo Bonzini
2021-04-01 11:22 ` [PULL 09/12] configure: Do not use default_feature for EXESUF Paolo Bonzini
2021-04-01 11:22 ` [PULL 10/12] hexagon: do not specify executables as inputs Paolo Bonzini
2021-04-01 11:22 ` [PULL 11/12] hexagon: do not specify Python scripts " Paolo Bonzini
2021-04-01 11:22 ` [PULL 12/12] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document Paolo Bonzini
2021-04-01 16:08 ` [PULL 00/12] Misc patches for QEMU 6.0-rc2 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=20210401112223.55711-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@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).