|
 |
9ae3a8 |
From 33ea847dbe677a3df68fecac80636050f72286ae Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 14 May 2014 08:31:42 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 11/31] virtio-net: out-of-bounds buffer write on load
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1400056285-6688-2-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 58856
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.1] virtio-net: out-of-bounds buffer write on load
|
|
|
9ae3a8 |
Bugzilla: 1095685
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
CVE-2013-4149 QEMU 1.3.0 out-of-bounds buffer write in
|
|
|
9ae3a8 |
virtio_net_load()@hw/net/virtio-net.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
> } else if (n->mac_table.in_use) {
|
|
|
9ae3a8 |
> uint8_t *buf = g_malloc0(n->mac_table.in_use);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
We are allocating buffer of size n->mac_table.in_use
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
> qemu_get_buffer(f, buf, n->mac_table.in_use * ETH_ALEN);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
and read to the n->mac_table.in_use size buffer n->mac_table.in_use *
|
|
|
9ae3a8 |
ETH_ALEN bytes, corrupting memory.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
If adversary controls state then memory written there is controlled
|
|
|
9ae3a8 |
by adversary.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 98f93ddd84800f207889491e0b5d851386b459cf)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1095685
|
|
|
9ae3a8 |
Tested: lightly on developer's box
|
|
|
9ae3a8 |
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7452039
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/net/virtio-net.c | 15 +++++++++++----
|
|
|
9ae3a8 |
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/net/virtio-net.c | 15 +++++++++++----
|
|
|
9ae3a8 |
1 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
|
9ae3a8 |
index 007cc2a..f72be9f 100644
|
|
|
9ae3a8 |
--- a/hw/net/virtio-net.c
|
|
|
9ae3a8 |
+++ b/hw/net/virtio-net.c
|
|
|
9ae3a8 |
@@ -1273,10 +1273,17 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
|
|
|
9ae3a8 |
if (n->mac_table.in_use <= MAC_TABLE_ENTRIES) {
|
|
|
9ae3a8 |
qemu_get_buffer(f, n->mac_table.macs,
|
|
|
9ae3a8 |
n->mac_table.in_use * ETH_ALEN);
|
|
|
9ae3a8 |
- } else if (n->mac_table.in_use) {
|
|
|
9ae3a8 |
- uint8_t *buf = g_malloc0(n->mac_table.in_use);
|
|
|
9ae3a8 |
- qemu_get_buffer(f, buf, n->mac_table.in_use * ETH_ALEN);
|
|
|
9ae3a8 |
- g_free(buf);
|
|
|
9ae3a8 |
+ } else {
|
|
|
9ae3a8 |
+ int64_t i;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* Overflow detected - can happen if source has a larger MAC table.
|
|
|
9ae3a8 |
+ * We simply set overflow flag so there's no need to maintain the
|
|
|
9ae3a8 |
+ * table of addresses, discard them all.
|
|
|
9ae3a8 |
+ * Note: 64 bit math to avoid integer overflow.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ for (i = 0; i < (int64_t)n->mac_table.in_use * ETH_ALEN; ++i) {
|
|
|
9ae3a8 |
+ qemu_get_byte(f);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
n->mac_table.multi_overflow = n->mac_table.uni_overflow = 1;
|
|
|
9ae3a8 |
n->mac_table.in_use = 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|