[Xen-changelog] [qemu-xen-traditional stable-4.6] qemu: ioport_read, ioport_write: be defensive about 32-bit addresses

[patchbot@xxxxxxx]

commit a7fd3717d99944530b04130f050e83402e64afed
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Mon Nov 14 17:19:46 2016 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Wed Dec 7 16:54:13 2016 +0000

    qemu: ioport_read, ioport_write: be defensive about 32-bit addresses
    
    On x86, ioport addresses are 16-bit.  That these functions take 32-bit
    arguments is a mistake.  Changing the argument type to 16-bit will
    discard the top bits of any erroneous values from elsewhere in qemu.
    
    Also, check just before use that the value is in range.  (This turns
    an ill-advised change to MAX_IOPORTS into a possible guest crash
    rather than a privilege escalation vulnerability.)
    
    And, in the Xen ioreq processor, clamp incoming ioport addresses to
    16-bit values.  Xen will never write >16-bit values but the guest may
    have access to the ioreq ring.  We want to defend the rest of the qemu
    code from wrong values.
    
    This is XSA-199.
    
    Reported-by: yanghongke <yanghongke@xxxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    (cherry picked from commit b669e922b37b8957248798a5eb7aa96a666cd3fe)
    (cherry picked from commit 095261a9ad5c31b9ed431f8382e8aa223089c85b)
    (cherry picked from commit 18858e28bb6bae83ddcf413995b2e68c4c7ae03d)
---
 i386-dm/helper2.c | 1 +
 vl.c              | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c
index a3fdbe3..b907eb4 100644
--- a/i386-dm/helper2.c
+++ b/i386-dm/helper2.c
@@ -378,6 +378,7 @@ static void cpu_ioreq_pio(CPUState *env, ioreq_t *req)
         fprintf(stderr, "PIO: bad size (%u)\n", req->size);
         exit(-1);
     }
+    req->addr &= 0x0ffffU;
 
     if (req->dir == IOREQ_READ) {
         if (!req->data_is_ptr) {
diff --git a/vl.c b/vl.c
index f9c4d7e..c3c5d63 100644
--- a/vl.c
+++ b/vl.c
@@ -52,6 +52,7 @@
 
 #include <xen/hvm/hvm_info_table.h>
 
+#include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -290,26 +291,30 @@ PicState2 *isa_pic;
 static IOPortReadFunc default_ioport_readb, default_ioport_readw, 
default_ioport_readl;
 static IOPortWriteFunc default_ioport_writeb, default_ioport_writew, 
default_ioport_writel;
 
-static uint32_t ioport_read(int index, uint32_t address)
+static uint32_t ioport_read(int index, uint16_t address)
 {
     static IOPortReadFunc *default_func[3] = {
         default_ioport_readb,
         default_ioport_readw,
         default_ioport_readl
     };
+    if (address >= MAX_IOPORTS)
+        abort();
     IOPortReadFunc *func = ioport_read_table[index][address];
     if (!func)
         func = default_func[index];
     return func(ioport_opaque[address], address);
 }
 
-static void ioport_write(int index, uint32_t address, uint32_t data)
+static void ioport_write(int index, uint16_t address, uint32_t data)
 {
     static IOPortWriteFunc *default_func[3] = {
         default_ioport_writeb,
         default_ioport_writew,
         default_ioport_writel
     };
+    if (address >= MAX_IOPORTS)
+        abort();
     IOPortWriteFunc *func = ioport_write_table[index][address];
     if (!func)
         func = default_func[index];
--
generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog