e2a042f066
Fix CVE-2013-4148 (bnc#864812), CVE-2013-4149 (bnc#864649), CVE-2013-4150 (bnc#864650), CVE-2013-4151 (bnc#864653), CVE-2013-4526 (bnc#864671), CVE-2013-4527 (bnc#864673), CVE-2013-4529 (bnc#864678), CVE-2013-4530 (bnc#864682), CVE-2013-4531 (bnc#864796), CVE-2013-4533 (bnc#864655), CVE-2013-4534 (bnc#864811), CVE-2013-4535 / CVE-2013-4536 (bnc#864665), CVE-2013-4537 (bnc#864391), CVE-2013-4538 (bnc#864769), CVE-2013-4539 (bnc#864805), CVE-2013-4540 (bnc#864801), CVE-2013-4541 (bnc#864802), CVE-2013-4542 (bnc#864804), CVE-2013-6399 (bnc#864814), CVE-2014-0182 (bnc#874788) OBS-URL: https://build.opensuse.org/request/show/235280 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=211
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 49af37a1dfdb6e7a54ae4ab9fd1c7816763bf6c1 Mon Sep 17 00:00:00 2001
|
|
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
Date: Thu, 3 Apr 2014 19:51:46 +0300
|
|
Subject: [PATCH] virtio: avoid buffer overrun on incoming migration
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2013-6399
|
|
|
|
vdev->queue_sel is read from the wire, and later used in the
|
|
emulation code as an index into vdev->vq[]. If the value of
|
|
vdev->queue_sel exceeds the length of vdev->vq[], currently
|
|
allocated to be VIRTIO_PCI_QUEUE_MAX elements, subsequent PIO
|
|
operations such as VIRTIO_PCI_QUEUE_PFN can be used to overrun
|
|
the buffer with arbitrary data originating from the source.
|
|
|
|
Fix this by failing migration if the value from the wire exceeds
|
|
VIRTIO_PCI_QUEUE_MAX.
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 4b53c2c72cb5541cf394033b528a6fe2a86c0ac1)
|
|
[AF: BNC#864814]
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/virtio/virtio.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
index 05f05e7..0072542 100644
|
|
--- a/hw/virtio/virtio.c
|
|
+++ b/hw/virtio/virtio.c
|
|
@@ -907,6 +907,9 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f)
|
|
qemu_get_8s(f, &vdev->status);
|
|
qemu_get_8s(f, &vdev->isr);
|
|
qemu_get_be16s(f, &vdev->queue_sel);
|
|
+ if (vdev->queue_sel >= VIRTIO_PCI_QUEUE_MAX) {
|
|
+ return -1;
|
|
+ }
|
|
qemu_get_be32s(f, &features);
|
|
|
|
if (virtio_set_features(vdev, features) < 0) {
|