From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 10 Dec 2014 09:17:36 +0000 (+0100)
Subject: vt82c686: avoid out-of-bounds read
X-Git-Tag: v2.2.1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d093159b4a48e24350cb7092b3b62ec4402f447;p=thirdparty%2Fqemu.git

vt82c686: avoid out-of-bounds read

superio_ioport_readb can read the 256th element of the array.
Coverity reports an out-of-bounds write in superio_ioport_writeb,
but it does not show the corresponding out-of-bounds read
because it cannot prove that it can happen.  Fix the root
cause of the problem (zhanghailang's patch instead fixes
the logic in superio_ioport_writeb).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: qemu-stable@nongnu.org
(cherry picked from commit 9feb8adeaa850d15b930c30f22c1ed2f2f695172)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index e0c235c3c2f..a43e26d3aff 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -36,7 +36,7 @@
 
 typedef struct SuperIOConfig
 {
-    uint8_t config[0xff];
+    uint8_t config[0x100];
     uint8_t index;
     uint8_t data;
 } SuperIOConfig;