Skip to contentSkip to conversation

net: ne2000: fix bounds check in ioport operations

PATCH Applied P J P 2 participants 3 messages Dec 31, 2015 – Jan 4, 2016

lore
Share & tools
lore

P J P

author
#0 lore raw

PATCH v3 1/1 net: ne2000: fix bounds check in ioport operations

From: Prasad J Pandit <[email protected]>

While doing ioport r/w operations, ne2000 device emulation suffers from OOB r/w errors. Update respective array bounds check to avoid OOB access.

---
 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

hw/net/ne2000.c +6 -4
index 010f9ef..9dd0c67 100644
@@ -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;
Signature · 1 line
2.4.3
Applied
#1 lore raw
Quoted 33 lines · P J P

From: Prasad J Pandit <[email protected]>

While doing ioport r/w operations, ne2000 device emulation suffers from OOB r/w errors. Update respective array bounds check to avoid OOB access.

---
 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

hw/net/ne2000.c +3 -2
index 010f9ef..9dd0c67 100644
@@ -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)

hw/net/ne2000.c static inline uint32_t ne2000_mem_readw(NE2000State *s, uint32_t addr) · line 506

Quoted 10 lines
hw/net/ne2000.c +3 -2
 {
     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;

Applied to my -net with minor tweaks:

Change "addr + sizeof(uint32_t) - 1 < NE2000_MEM_SIZE" to "addr + sizeof(uint32_t) <= NE2000_MEM_SIZE".

Thanks

author
#2 lore raw
+-- On Mon, 4 Jan 2016, Jason Wang wrote --+
| > +    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;
| 
| Applied to my -net with minor tweaks:
| 
| Change "addr + sizeof(uint32_t) - 1 < NE2000_MEM_SIZE" to "addr +
| sizeof(uint32_t) <= NE2000_MEM_SIZE".

Okay, thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F