yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-virtio-net-fix-guest-triggerable-buffer-overrun.patch

0a122b
From 92504013c1489168e3514f3c7342c016156c6af3 Mon Sep 17 00:00:00 2001
0a122b
From: Michael S. Tsirkin <mst@redhat.com>
0a122b
Date: Wed, 19 Mar 2014 17:21:02 +0200
0a122b
Subject: [PATCH] virtio-net: fix guest-triggerable buffer overrun
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1395242197-28749-1-git-send-email-mst@redhat.com>
0a122b
O-Subject: [virt-devel][PATCH EMBARGOED qemu-kvm RHEL7.0] virtio-net: fix
0a122b
Bugzilla: 1078308
0a122b
RH-Acked-by: Markus Armbruster <armbruz@redhat.com>
0a122b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
0a122b
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
0a122b
0a122b
When VM guest programs multicast addresses for
0a122b
a virtio net card, it supplies a 32 bit
0a122b
entries counter for the number of addresses.
0a122b
These addresses are read into tail portion of
0a122b
a fixed macs array which has size MAC_TABLE_ENTRIES,
0a122b
at offset equal to in_use.
0a122b
0a122b
To avoid overflow of this array by guest, qemu attempts
0a122b
to test the size as follows:
0a122b
-    if (in_use + mac_data.entries <= MAC_TABLE_ENTRIES) {
0a122b
0a122b
however, as mac_data.entries is uint32_t, this sum
0a122b
can overflow, e.g. if in_use is 1 and mac_data.entries
0a122b
is 0xffffffff then in_use + mac_data.entries will be 0.
0a122b
0a122b
Qemu will then read guest supplied buffer into this
0a122b
memory, overflowing buffer on heap.
0a122b
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
0a122b
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1078308
0a122b
Upstream status: EMBARGOED RT 284849
0a122b
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7225956
0a122b
---
0a122b
 hw/net/virtio-net.c |    2 +-
0a122b
 1 files changed, 1 insertions(+), 1 deletions(-)
0a122b
0a122b
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
0a122b
index 06c53fe..2d559e0 100644
0a122b
--- a/hw/net/virtio-net.c
0a122b
+++ b/hw/net/virtio-net.c
0a122b
@@ -594,7 +594,7 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd,
0a122b
         goto error;
0a122b
     }
0a122b
 
0a122b
-    if (in_use + mac_data.entries <= MAC_TABLE_ENTRIES) {
0a122b
+    if (mac_data.entries <= MAC_TABLE_ENTRIES - in_use) {
0a122b
         s = iov_to_buf(iov, iov_cnt, 0, &macs[in_use * ETH_ALEN],
0a122b
                        mac_data.entries * ETH_ALEN);
0a122b
         if (s != mac_data.entries * ETH_ALEN) {
0a122b
-- 
0a122b
1.7.1
0a122b