From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEbW8-0000mT-Gu for qemu-devel@nongnu.org; Thu, 31 Dec 2015 06:35:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEbW5-00088k-7Y for qemu-devel@nongnu.org; Thu, 31 Dec 2015 06:35:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEbW5-000887-1O for qemu-devel@nongnu.org; Thu, 31 Dec 2015 06:35:37 -0500 From: P J P Date: Thu, 31 Dec 2015 17:05:27 +0530 Message-Id: <1451561727-21105-1-git-send-email-ppandit@redhat.com> Subject: [Qemu-devel] [PATCH v3] net: ne2000: fix bounds check in ioport operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: Prasad J Pandit , QEMU Developers , Ling Liu From: Prasad J Pandit 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 Signed-off-by: Prasad J Pandit --- 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 diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 010f9ef..9dd0c67 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -467,8 +467,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) - 1 < NE2000_MEM_SIZE)) { 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) { 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) - 1 < NE2000_MEM_SIZE)) { return ldl_le_p(s->mem + addr); } else { return 0xffffffff; -- 2.4.3