|
 |
ae23c9 |
From 22ab26a5dcda3ff217d543a4eff8dbad9160ce1c Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Xiao Wang <jasowang@redhat.com>
|
|
|
ae23c9 |
Date: Fri, 11 Jan 2019 07:58:56 +0000
|
|
|
ae23c9 |
Subject: [PATCH 01/11] ne2000: fix possible out of bound access in
|
|
|
ae23c9 |
ne2000_receive
|
|
|
ae23c9 |
MIME-Version: 1.0
|
|
|
ae23c9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ae23c9 |
Content-Transfer-Encoding: 8bit
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Xiao Wang <jasowang@redhat.com>
|
|
|
ae23c9 |
Message-id: <20190111075904.2030-2-jasowang@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 83976
|
|
|
ae23c9 |
O-Subject: [RHEL8 qemu-kvm PATCH 1/9] ne2000: fix possible out of bound access in ne2000_receive
|
|
|
ae23c9 |
Bugzilla: 1636784
|
|
|
ae23c9 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
In ne2000_receive(), we try to assign size_ to size which converts
|
|
|
ae23c9 |
from size_t to integer. This will cause troubles when size_ is greater
|
|
|
ae23c9 |
INT_MAX, this will lead a negative value in size and it can then pass
|
|
|
ae23c9 |
the check of size < MIN_BUF_SIZE which may lead out of bound access of
|
|
|
ae23c9 |
for both buf and buf1.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Fixing by converting the type of size to size_t.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
CC: qemu-stable@nongnu.org
|
|
|
ae23c9 |
Reported-by: Daniel Shapira <daniel@twistlock.com>
|
|
|
ae23c9 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit fdc89e90fac40c5ca2686733df17b6423fb8d8fb)
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
hw/net/ne2000.c | 4 ++--
|
|
|
ae23c9 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
|
|
|
ae23c9 |
index 3a9fc89..19fac06 100644
|
|
|
ae23c9 |
--- a/hw/net/ne2000.c
|
|
|
ae23c9 |
+++ b/hw/net/ne2000.c
|
|
|
ae23c9 |
@@ -173,7 +173,7 @@ static int ne2000_buffer_full(NE2000State *s)
|
|
|
ae23c9 |
ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
NE2000State *s = qemu_get_nic_opaque(nc);
|
|
|
ae23c9 |
- int size = size_;
|
|
|
ae23c9 |
+ size_t size = size_;
|
|
|
ae23c9 |
uint8_t *p;
|
|
|
ae23c9 |
unsigned int total_len, next, avail, len, index, mcast_idx;
|
|
|
ae23c9 |
uint8_t buf1[60];
|
|
|
ae23c9 |
@@ -181,7 +181,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
|
|
|
ae23c9 |
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
|
|
ae23c9 |
|
|
|
ae23c9 |
#if defined(DEBUG_NE2000)
|
|
|
ae23c9 |
- printf("NE2000: received len=%d\n", size);
|
|
|
ae23c9 |
+ printf("NE2000: received len=%zu\n", size);
|
|
|
ae23c9 |
#endif
|
|
|
ae23c9 |
|
|
|
ae23c9 |
if (s->cmd & E8390_STOP || ne2000_buffer_full(s))
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|