diff options
| author | Prasad J Pandit <pjp@fedoraproject.org> | 2015-12-31 17:05:27 +0530 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-03-22 17:40:34 -0500 |
| commit | 38e09211b6ab29a21788a39166ded08c1724879d (patch) | |
| tree | d575ff0065491ca5cb731aea983bf4805f5ffcfb | |
| parent | d0ee85b4e4c6cc2c8fac311d6df2ed412ed0df5f (diff) | |
| download | hqemu-38e09211b6ab29a21788a39166ded08c1724879d.zip hqemu-38e09211b6ab29a21788a39166ded08c1724879d.tar.gz | |
net: ne2000: fix bounds check in ioport operations
While doing ioport r/w operations, ne2000 device emulation suffers
from OOB r/w errors. Update respective array bounds check to avoid
OOB access.
Reported-by: Ling Liu <liuling-it@360.cn>
Cc: qemu-stable@nongnu.org
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit aa7f9966dfdff500bbbf1956d9e115b1fa8987a6)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/net/ne2000.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 84a7263..995115e 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -471,8 +471,9 @@ static inline void ne2000_mem_writel(NE2000State *s, uint32_t addr, uint32_t val) { addr &= ~1; /* XXX: check exact behaviour if not even */ - if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { + if (addr < 32 + || (addr >= NE2000_PMEM_START + && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) { stl_le_p(s->mem + addr, val); } } @@ -501,8 +502,9 @@ static inline uint32_t ne2000_mem_readw(NE2000State *s, uint32_t addr) static inline uint32_t ne2000_mem_readl(NE2000State *s, uint32_t addr) { addr &= ~1; /* XXX: check exact behaviour if not even */ - if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { + if (addr < 32 + || (addr >= NE2000_PMEM_START + && addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) { return ldl_le_p(s->mem + addr); } else { return 0xffffffff; |
