[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/36] virtio: validate num_sg when mapping
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 13/36] virtio: validate num_sg when mapping |
Date: |
Mon, 5 May 2014 22:30:11 +0200 |
From: "Michael S. Tsirkin" <address@hidden>
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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Cc: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
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);
--
1.9.0
- [Qemu-devel] [PATCH 04/36] virtio-net: fix buffer overflow on invalid state load, (continued)
- [Qemu-devel] [PATCH 04/36] virtio-net: fix buffer overflow on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 03/36] vmstate: add VMSTATE_VALIDATE, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 01/36] vmstate: reduce code duplication, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 06/36] virtio: out-of-bounds buffer write on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 08/36] hpet: fix buffer overrun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 09/36] hw/pci/pcie_aer.c: fix buffer overruns on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 10/36] pl022: fix buffer overun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 11/36] vmstate: fix buffer overflow in target-arm/machine.c, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 12/36] virtio: avoid buffer overrun on incoming migration, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 14/36] pxa2xx: avoid buffer overrun on incoming migration, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 13/36] virtio: validate num_sg when mapping,
Juan Quintela <=
- [Qemu-devel] [PATCH 16/36] tsc210x: fix buffer overrun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 15/36] ssd0323: fix buffer overun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 18/36] virtio-scsi: fix buffer overrun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 17/36] zaurus: fix buffer overrun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 21/36] savevm: Ignore minimum_version_id_old if there is no load_state_old, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 22/36] ssi-sd: fix buffer overrun on invalid state load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 19/36] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 23/36] openpic: avoid buffer overrun on incoming migration, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 20/36] usb: sanity check setup_index+setup_len in post_load, Juan Quintela, 2014/05/05
- [Qemu-devel] [PATCH 24/36] virtio-net: out-of-bounds buffer write on load, Juan Quintela, 2014/05/05