orion / rpms / qemu

Forked from rpms/qemu 4 years ago
Clone
1435a64
From: Jason Wang <jasowang@redhat.com>
1435a64
Date: Wed, 30 May 2018 13:08:15 +0800
1435a64
Subject: [PATCH] ne2000: fix possible out of bound access in ne2000_receive
1435a64
1435a64
In ne2000_receive(), we try to assign size_ to size which converts
1435a64
from size_t to integer. This will cause troubles when size_ is greater
1435a64
INT_MAX, this will lead a negative value in size and it can then pass
1435a64
the check of size < MIN_BUF_SIZE which may lead out of bound access of
1435a64
for both buf and buf1.
1435a64
1435a64
Fixing by converting the type of size to size_t.
1435a64
1435a64
CC: qemu-stable@nongnu.org
1435a64
Reported-by: Daniel Shapira <daniel@twistlock.com>
1435a64
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
1435a64
Signed-off-by: Jason Wang <jasowang@redhat.com>
1435a64
(cherry picked from commit fdc89e90fac40c5ca2686733df17b6423fb8d8fb)
1435a64
---
1435a64
 hw/net/ne2000.c | 4 ++--
1435a64
 1 file changed, 2 insertions(+), 2 deletions(-)
1435a64
1435a64
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
1435a64
index 07d79e317f..869518ee06 100644
1435a64
--- a/hw/net/ne2000.c
1435a64
+++ b/hw/net/ne2000.c
1435a64
@@ -174,7 +174,7 @@ static int ne2000_buffer_full(NE2000State *s)
1435a64
 ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
1435a64
 {
1435a64
     NE2000State *s = qemu_get_nic_opaque(nc);
1435a64
-    int size = size_;
1435a64
+    size_t size = size_;
1435a64
     uint8_t *p;
1435a64
     unsigned int total_len, next, avail, len, index, mcast_idx;
1435a64
     uint8_t buf1[60];
1435a64
@@ -182,7 +182,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
1435a64
         { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
1435a64
 
1435a64
 #if defined(DEBUG_NE2000)
1435a64
-    printf("NE2000: received len=%d\n", size);
1435a64
+    printf("NE2000: received len=%zu\n", size);
1435a64
 #endif
1435a64
 
1435a64
     if (s->cmd & E8390_STOP || ne2000_buffer_full(s))