qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: [PULL 04/10] target/i386/tcg: validate segment registers
Date: Thu, 20 Nov 2025 01:16:43 +0100	[thread overview]
Message-ID: <20251120001649.1085913-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20251120001649.1085913-1-pbonzini@redhat.com>

Correctly reject invalid segment registers, including CS when used as
the destination of a MOV.  Ignore the REX prefix as well.

Fixes: 5e9e21bcc4d ("target/i386: move 60-BF opcodes to new decoder", 2024-05-07)
Cc: qemu-stable@nongnu.org
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3195
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/tcg/decode-new.c.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/i386/tcg/decode-new.c.inc b/target/i386/tcg/decode-new.c.inc
index 805cfd08e83..0f8c5d16938 100644
--- a/target/i386/tcg/decode-new.c.inc
+++ b/target/i386/tcg/decode-new.c.inc
@@ -2059,7 +2059,12 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
 
     case X86_TYPE_S:  /* reg selects a segment register */
         op->unit = X86_OP_SEG;
-        goto get_reg;
+        op->n = (get_modrm(s, env) >> 3) & 7;
+        /* Values outside [CDEFGS]S, as well as storing to CS, are invalid.  */
+        if (op->n >= 6 || (op->n == R_CS && op == &decode->op[0])) {
+            return false;
+        }
+        break;
 
     case X86_TYPE_P:
         op->unit = X86_OP_MMX;
-- 
2.51.1



  parent reply	other threads:[~2025-11-20  0:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-20  0:16 [PULL 00/10] x86, mtest2make changes for QEMU 10.2 Paolo Bonzini
2025-11-20  0:16 ` [PULL 01/10] ioapic: fix typo in irqfd check Paolo Bonzini
2025-11-20  0:16 ` [PULL 02/10] target/i386: emulate: Make sure fetch_instruction exist before calling it Paolo Bonzini
2025-11-20  0:16 ` [PULL 03/10] target/i386: Mark VPERMILPS as not valid with prefix 0 Paolo Bonzini
2025-11-20  0:16 ` Paolo Bonzini [this message]
2025-11-20  0:16 ` [PULL 05/10] target/i386: svm: fix sign extension of exit code Paolo Bonzini
2025-11-20  0:16 ` [PULL 06/10] target/i386: fix stack size when delivering real mode interrupts Paolo Bonzini
2025-11-20  0:16 ` [PULL 07/10] mtest2make: cleanup mtest-suites variables Paolo Bonzini
2025-11-20  0:16 ` [PULL 08/10] mtest2make: add dependencies to the "speed-qualified" suite Paolo Bonzini
2025-11-20  0:16 ` [PULL 09/10] mtest2make: do not repeat the same speed over and over Paolo Bonzini
2025-11-20  0:16 ` [PULL 10/10] replay: add tracing events Paolo Bonzini
2025-11-20 21:56 ` [PULL 00/10] x86, mtest2make changes for QEMU 10.2 Richard Henderson

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=20251120001649.1085913-5-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.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).