37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From f609ef91bccd8b1637575516a94a5dc0af804b40 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
|
Date: Mon, 12 May 2014 12:04:20 +0300
|
||
|
|
Subject: [PATCH] virtio: allow mapping up to max queue size
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
It's a loop from i < num_sg and the array is VIRTQUEUE_MAX_SIZE - so
|
||
|
|
it's OK if the value read is VIRTQUEUE_MAX_SIZE.
|
||
|
|
|
||
|
|
Not a big problem in practice as people don't use
|
||
|
|
such big queues, but it's inelegant.
|
||
|
|
|
||
|
|
Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
(cherry picked from commit 937251408051e0489f78e4db3c92e045b147b38b)
|
||
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
||
|
|
---
|
||
|
|
hw/virtio/virtio.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
||
|
|
index 7f4e7ec..3557c17 100644
|
||
|
|
--- a/hw/virtio/virtio.c
|
||
|
|
+++ b/hw/virtio/virtio.c
|
||
|
|
@@ -430,7 +430,7 @@ void virtqueue_map_sg(struct iovec *sg, hwaddr *addr,
|
||
|
|
unsigned int i;
|
||
|
|
hwaddr len;
|
||
|
|
|
||
|
|
- if (num_sg >= VIRTQUEUE_MAX_SIZE) {
|
||
|
|
+ if (num_sg > VIRTQUEUE_MAX_SIZE) {
|
||
|
|
error_report("virtio: map attempt out of bounds: %zd > %d",
|
||
|
|
num_sg, VIRTQUEUE_MAX_SIZE);
|
||
|
|
exit(1);
|