[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3] x86emul: Zero-extend unsigned 8-bit immediates when decoding


  • To: xen-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Stephen Cheng <stephen.cheng@xxxxxxxxxx>
  • Date: Tue, 17 Nov 2026 10:50:10 +0800
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qkaSQj4dpj4zm+aury9g4Oxk9SnMWdmYuS5AHcLrc+U=; b=yOx93KKnR81eNqjnX4bCNaQtri+vMcnhfGovqrusO13BYLnILmUj3/K/lrKP83mgIAfFVzWOOVSwIlSr4tWySh3fFF8WotkYuouXBUIj/Zpn9oR9sHuoiuQRPTjMHvbiZQQ5s+Bg7+Ig8k7UJTK5HDfZgfLUaPz4J4tFHQfYtw/jfgxC5t3Cik0smrMinTnAo7eX2YKYBvbWyNFDTnnu2KRmRXBfDG3/GC5asFavgb0PrExXX3Uw6UZkwBGE2kk1GffQaip/hxK4+CjT0vdA5sq1MNb5YudbkFfnLQSD13ChVnXlPpmwlC11ti1YL0ZoPkQ1Hdc0aXsGW1+0iYDMGw==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aDWJ0lMAFsxwxIUHDT4GNxpVNWP71IoPDg/wjNlGmenxMZyrrQNw2V0ZexaApIUO/3/s2BK/kN3uyabTBklZ0cuykkkJ1FmyIvTdy/oFqlmBbLhDkTcFBBzBFp/Qy3reDxay7x+8shrThbBfD2qzyhuR9aPCtKAVJBI6ewE0KsI9LxDs1LMAPBcahlp/oqKSEjmlYji6bs7lK61m5jPJQhbGjilI2l30nOfmTNPxzsPt5r3D7pWc36RATT0OPwuEmI14Nr9lK4CyzvAsq4+sR/ijYx+Uvzgt+Rr+3LYHUVqT20eY9Sc0jWH82d66TZze1O+EvSE/WQVWATt/hbWKCA==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
  • Cc: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>, Stephen Cheng <stephen.cheng@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, Teddy Astie <teddy.astie@xxxxxxxxxx>
  • Delivery-date: Tue, 17 Nov 2026 02:50:28 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

The decoder sign-extends all 8-bit immediates. This is right for e.g.
Jcc rel8 and Grp1 (83), but some 8-bit immediates are unsigned: the
vector of INT, the port of IN/OUT, the base of AAM/AAD, the count of
the Grp2 shifts (C0, C1), and the 8-bit immediates in the 0F, 0F3A and
XOP08 maps. For these, s->imm1 holds a wrong value for 0x80 and above.
x86_insn_immediate() can return this value too.

The worst case is INT $0x80 to INT $0xff, which puts a negative vector
into the event (e.g. -128 for 0x80). hvm_inject_event() then fails its
"vector == event->vector" assertion, and a debug Xen panics. An HVM
guest can trigger this with the forced emulation prefix (hvm_fep).

Zero-extend these immediates in the decoder. At the IN/OUT and AAM/AAD
use sites, replace the (uint8_t) casts, which are not needed any more,
with ASSERT()s.

Fixes: 653cae725cea ("x86/32on64: use generic instruction decoding for call 
gate emulation")
Fixes: 52053d5fc2f9 ("x86/emul: Drop swint_emulate infrastructure")
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Stephen Cheng <stephen.cheng@xxxxxxxxxx>
---
v3:
 - Move the new case block down, to keep the case blocks sorted (Jan).
 - Add a comment for the 0F, 0F3A and XOP08 maps (Jan).
 - Use "&= 0xff" instead of casts (Jan).
 - Add ASSERT()s at the IN/OUT and AAM/AAD use sites (Jan).

v2:
 - Fix this in the decoder instead of at the INT use site, and also cover
   the IN/OUT, AAM/AAD and C0/C1 immediates, plus the 0F, 0F3A and XOP08
   maps (Jan).
 - Drop the (uint8_t) casts at the IN/OUT and AAM/AAD use sites (Jan).
 - Add a Fixes: tag for the commit that added x86_insn_immediate() (Jan).
 - Drop Ross's R-b (patch changed a lot).

v2: 
https://lore.kernel.org/xen-devel/20261116012748.4872-1-stephen.cheng@xxxxxxxxxx/
v1: 
https://lore.kernel.org/xen-devel/20261112072303.86955-1-stephen.cheng@xxxxxxxxxx/

 xen/arch/x86/x86_emulate/decode.c      | 20 ++++++++++++++++++--
 xen/arch/x86/x86_emulate/private.h     |  2 +-
 xen/arch/x86/x86_emulate/x86_emulate.c |  6 ++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/x86_emulate/decode.c 
b/xen/arch/x86/x86_emulate/decode.c
index c4b18718f8..07ff44b601 100644
--- a/xen/arch/x86/x86_emulate/decode.c
+++ b/xen/arch/x86/x86_emulate/decode.c
@@ -650,8 +650,6 @@ decode_onebyte(struct x86_emulate_state *s,
     case 0xc4: /* les */
     case 0xc5: /* lds */
     case 0xce: /* into */
-    case 0xd4: /* aam */
-    case 0xd5: /* aad */
     case 0xd6: /* salc / udb */
         s->not_64bit = true;
         break;
@@ -690,6 +688,17 @@ decode_onebyte(struct x86_emulate_state *s,
                        ((uint64_t)insn_fetch_type(uint32_t) << 32));
         break;
 
+    case 0xd4: /* aam */
+    case 0xd5: /* aad */
+        s->not_64bit = true;
+        fallthrough;
+    case 0xc0: case 0xc1: /* Grp2 */
+    case 0xcd: /* int imm8 */
+    case 0xe4 ... 0xe7: /* in/out imm8 */
+        /* The 8-bit immediate is unsigned. */
+        s->imm1 &= 0xff;
+        break;
+
     case 0xc8: /* enter imm16,imm8 */
         s->imm2 = insn_fetch_type(uint8_t);
         break;
@@ -1796,6 +1805,9 @@ int x86emul_decode(struct x86_emulate_state *s,
         break;
 
     case ext_0f:
+        /* All immediates in this encoding space are unsigned ones. */
+        if ( (d & SrcMask) == SrcImmByte )
+            s->imm1 &= 0xff;
         rc = decode_twobyte(s, ctxt, ops);
         break;
 
@@ -1804,6 +1816,8 @@ int x86emul_decode(struct x86_emulate_state *s,
         break;
 
     case ext_0f3a:
+        /* All immediates in this encoding space are unsigned ones. */
+        s->imm1 &= 0xff;
         d = ext0f3a_table[b].to_mem ? DstMem | SrcReg : DstReg | SrcMem;
         if ( ext0f3a_table[b].two_op )
             d |= TwoOp;
@@ -1814,6 +1828,8 @@ int x86emul_decode(struct x86_emulate_state *s,
         break;
 
     case ext_8f08:
+        /* All immediates in this encoding space are unsigned ones. */
+        s->imm1 &= 0xff;
         d = DstReg | SrcMem;
         if ( ext8f08_table[b].two_op )
             d |= TwoOp;
diff --git a/xen/arch/x86/x86_emulate/private.h 
b/xen/arch/x86/x86_emulate/private.h
index 7892b5603b..b2997b20cd 100644
--- a/xen/arch/x86/x86_emulate/private.h
+++ b/xen/arch/x86/x86_emulate/private.h
@@ -62,7 +62,7 @@ void BUG(void);
 #define SrcMem      (2<<3) /* Memory operand. */
 #define SrcMem16    (3<<3) /* Memory operand (16-bit). */
 #define SrcImm      (4<<3) /* Immediate operand. */
-#define SrcImmByte  (5<<3) /* 8-bit sign-extended immediate operand. */
+#define SrcImmByte  (5<<3) /* 8-bit immediate operand. */
 #define SrcImm16    (6<<3) /* 16-bit zero-extended immediate operand. */
 #define SrcMask     (7<<3)
 /* Generic ModRM decode. */
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c 
b/xen/arch/x86/x86_emulate/x86_emulate.c
index f168f3ebcf..4ad3e556a0 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -2505,7 +2505,8 @@ x86_emulate(
 
     case 0xd4: /* aam */
     case 0xd5: /* aad */
-        n = (uint8_t)src.val;
+        ASSERT(src.val <= 0xff);
+        n = src.val;
         if ( b & 0x01 )
             _regs.ax = (uint8_t)(_regs.al + (_regs.ah * n));
         else
@@ -2561,8 +2562,9 @@ x86_emulate(
     case 0xed: /* in %dx,%eax */
     case 0xee: /* out %al,%dx */
     case 0xef: /* out %eax,%dx */ {
-        unsigned int port = ((b < 0xe8) ? (uint8_t)src.val : _regs.dx);
+        unsigned int port = ((b < 0xe8) ? src.val : _regs.dx);
 
+        ASSERT(b >= 0xe8 || src.val <= 0xff);
         op_bytes = !(b & 1) ? 1 : (op_bytes == 8) ? 4 : op_bytes;
         if ( (rc = ioport_access_check(port, op_bytes, ctxt, ops)) != 0 )
             goto done;
-- 
2.49.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.