47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
From c5b839d16efe607af264cd6c2d99124b2a10bc02 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
|
Date: Thu, 3 Apr 2014 19:51:53 +0300
|
||
|
|
Subject: [PATCH] virtio: validate num_sg when mapping
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2013-4535
|
||
|
|
CVE-2013-4536
|
||
|
|
|
||
|
|
Both virtio-block and virtio-serial read,
|
||
|
|
VirtQueueElements are read in as buffers, and passed to
|
||
|
|
virtqueue_map_sg(), where num_sg is taken from the wire and can force
|
||
|
|
writes to indicies beyond VIRTQUEUE_MAX_SIZE.
|
||
|
|
|
||
|
|
To fix, validate num_sg.
|
||
|
|
|
||
|
|
Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Cc: Amit Shah <amit.shah@redhat.com>
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
(cherry picked from commit 36cf2a37132c7f01fa9adb5f95f5312b27742fd4)
|
||
|
|
[AF: BNC#864665]
|
||
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||
|
|
---
|
||
|
|
hw/virtio/virtio.c | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
||
|
|
index 0072542..a70169a 100644
|
||
|
|
--- a/hw/virtio/virtio.c
|
||
|
|
+++ b/hw/virtio/virtio.c
|
||
|
|
@@ -430,6 +430,12 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr,
|
||
|
|
unsigned int i;
|
||
|
|
hwaddr len;
|
||
|
|
|
||
|
|
+ if (num_sg >= VIRTQUEUE_MAX_SIZE) {
|
||
|
|
+ error_report("virtio: map attempt out of bounds: %zd > %d",
|
||
|
|
+ num_sg, VIRTQUEUE_MAX_SIZE);
|
||
|
|
+ exit(1);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
for (i = 0; i < num_sg; i++) {
|
||
|
|
len = sg[i].iov_len;
|
||
|
|
sg[i].iov_base = cpu_physical_memory_map(addr[i], &len, is_write);
|