Received: from eggs.gnu.org ([2001:4830:134:3::10]:38250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEBQk-0003HW-H5 for qemu-devel@nongnu.org; Wed, 30 Dec 2015 02:44:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEBQg-00009g-KP for qemu-devel@nongnu.org; Wed, 30 Dec 2015 02:44:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEBQg-00009N-D6 for qemu-devel@nongnu.org; Wed, 30 Dec 2015 02:44:18 -0500 From: P J P Date: Wed, 30 Dec 2015 13:14:07 +0530 Message-Id: <1451461447-6829-2-git-send-email-ppandit@redhat.com> In-Reply-To: <1451461447-6829-1-git-send-email-ppandit@redhat.com> References: <1451461447-6829-1-git-send-email-ppandit@redhat.com> Subject: [Qemu-devel] [PATCH] net: ne2000: fix bounds check in ioport operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Jason Wang , Prasad J Pandit , Ling Liu From: Prasad J Pandit While doing ioport r/w oprations, ne2000 device emulation suffers from OOB r/w error. Update respective array bounds check to avoid OOB access. Reported-by: Ling Liu Signed-off-by: Prasad J Pandit --- hw/net/ne2000.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 010f9ef..42e4804 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -447,9 +447,10 @@ static uint32_t ne2000_ioport_read(void *opaque, uint32_t addr) static inline void ne2000_mem_writeb(NE2000State *s, uint32_t addr, uint32_t val) { - if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { - s->mem[addr] = val; + if (addr < 32 + || (addr >= NE2000_PMEM_START + && addr <= NE2000_MEM_SIZE - sizeof(uint8_t))) { + s->mem[addr] = (uint8_t)val; } } @@ -457,8 +458,9 @@ static inline void ne2000_mem_writew(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 <= NE2000_MEM_SIZE - sizeof(uint16_t))) { *(uint16_t *)(s->mem + addr) = cpu_to_le16(val); } } @@ -467,17 +469,19 @@ 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 <= NE2000_MEM_SIZE - sizeof(uint32_t))) { stl_le_p(s->mem + addr, val); } } static inline uint32_t ne2000_mem_readb(NE2000State *s, uint32_t addr) { - if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { - return s->mem[addr]; + if (addr < 32 + || (addr >= NE2000_PMEM_START + && addr <= NE2000_MEM_SIZE - sizeof(uint8_t))) { + return (uint8_t)s->mem[addr]; } else { return 0xff; } @@ -486,8 +490,9 @@ static inline uint32_t ne2000_mem_readb(NE2000State *s, uint32_t addr) static inline uint32_t ne2000_mem_readw(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 <= NE2000_MEM_SIZE - sizeof(uint16_t))) { return le16_to_cpu(*(uint16_t *)(s->mem + addr)); } else { return 0xffff; @@ -497,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 <= NE2000_MEM_SIZE - sizeof(uint32_t))) { return ldl_le_p(s->mem + addr); } else { return 0xffffffff; -- 2.4.3