ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Prasad J Pandit 2015-12-31 17:05:27 +05:30 committed by Jason Wang
parent 007cd223de
commit aa7f9966df
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/net/ne2000.c
View File

@ -467,8 +467,9 @@ static inline void ne2000_mem_writel(NE2000State *s, uint32_t addr,
uint32_t val) uint32_t val)
{ {
addr &= ~1; /* XXX: check exact behaviour if not even */ addr &= ~1; /* XXX: check exact behaviour if not even */
if (addr < 32 || if (addr < 32
(addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { || (addr >= NE2000_PMEM_START
&& addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
stl_le_p(s->mem + addr, val); stl_le_p(s->mem + addr, val);
} }
} }
@ -497,8 +498,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) static inline uint32_t ne2000_mem_readl(NE2000State *s, uint32_t addr)
{ {
addr &= ~1; /* XXX: check exact behaviour if not even */ addr &= ~1; /* XXX: check exact behaviour if not even */
if (addr < 32 || if (addr < 32
(addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { || (addr >= NE2000_PMEM_START
&& addr + sizeof(uint32_t) <= NE2000_MEM_SIZE)) {
return ldl_le_p(s->mem + addr); return ldl_le_p(s->mem + addr);
} else { } else {
return 0xffffffff; return 0xffffffff;