44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From: Prasad J Pandit <address@hidden>
|
||
|
|
|
||
|
|
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 <address@hidden>
|
||
|
|
Signed-off-by: Prasad J Pandit <address@hidden>
|
||
|
|
---
|
||
|
|
hw/net/ne2000.c | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
Updated as per review in
|
||
|
|
-> https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg04863.html
|
||
|
|
|
||
|
|
Index: xen-4.6.0-testing/tools/qemu-xen-dir-remote/hw/net/ne2000.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-dir-remote/hw/net/ne2000.c
|
||
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-dir-remote/hw/net/ne2000.c
|
||
|
|
@@ -476,8 +476,9 @@ static inline void ne2000_mem_writel(NE2
|
||
|
|
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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -506,8 +507,9 @@ static inline uint32_t ne2000_mem_readw(
|
||
|
|
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;
|