|
 |
3a13ddd |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
3a13ddd |
Date: Mon, 19 Sep 2016 23:55:45 +0530
|
|
|
3a13ddd |
Subject: [PATCH] virtio: add check for descriptor's mapped address
|
|
|
3a13ddd |
|
|
|
3a13ddd |
virtio back end uses set of buffers to facilitate I/O operations.
|
|
|
3a13ddd |
If its size is too large, 'cpu_physical_memory_map' could return
|
|
|
3a13ddd |
a null address. This would result in a null dereference while
|
|
|
3a13ddd |
un-mapping descriptors. Add check to avoid it.
|
|
|
3a13ddd |
|
|
|
3a13ddd |
Reported-by: Qinghao Tang <luodalongde@gmail.com>
|
|
|
3a13ddd |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
3a13ddd |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
3a13ddd |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
3a13ddd |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
3a13ddd |
(cherry picked from commit 973e7170dddefb491a48df5cba33b2ae151013a0)
|
|
|
3a13ddd |
---
|
|
|
3a13ddd |
hw/virtio/virtio.c | 5 +++++
|
|
|
3a13ddd |
1 file changed, 5 insertions(+)
|
|
|
3a13ddd |
|
|
|
3a13ddd |
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
|
3a13ddd |
index 74c085c..eabe573 100644
|
|
|
3a13ddd |
--- a/hw/virtio/virtio.c
|
|
|
3a13ddd |
+++ b/hw/virtio/virtio.c
|
|
|
3a13ddd |
@@ -473,6 +473,11 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
|
|
|
3a13ddd |
}
|
|
|
3a13ddd |
|
|
|
3a13ddd |
iov[num_sg].iov_base = cpu_physical_memory_map(pa, &len, is_write);
|
|
|
3a13ddd |
+ if (!iov[num_sg].iov_base) {
|
|
|
3a13ddd |
+ error_report("virtio: bogus descriptor or out of resources");
|
|
|
3a13ddd |
+ exit(1);
|
|
|
3a13ddd |
+ }
|
|
|
3a13ddd |
+
|
|
|
3a13ddd |
iov[num_sg].iov_len = len;
|
|
|
3a13ddd |
addr[num_sg] = pa;
|
|
|
3a13ddd |
|