update to 2.7

[pve-qemu-kvm.git] / debian / patches / extra / CVE-2016-7422-virtio-add-check-for-descriptor-s-mapped-address.patch

diff --git a/debian/patches/extra/CVE-2016-7422-virtio-add-check-for-descriptor-s-mapped-address.patch b/debian/patches/extra/CVE-2016-7422-virtio-add-check-for-descriptor-s-mapped-address.patch
index 47e5135ddd3cba217a66cabd2420ee1f49fb146d..6ee65d14c9d69098f5879e66a659e4bc08c8f6ba 100644 (file)
--- a/debian/patches/extra/CVE-2016-7422-virtio-add-check-for-descriptor-s-mapped-address.patch
+++ b/debian/patches/extra/CVE-2016-7422-virtio-add-check-for-descriptor-s-mapped-address.patch
@@ -1,7 +1,7 @@
-From 77b365c29e9bf143ee4c024daa9f6f0a13213376 Mon Sep 17 00:00:00 2001
+From 1723b5e7962eb077353bab0772ca8114774b6c60 Mon Sep 17 00:00:00 2001
 From: Prasad J Pandit <pjp@fedoraproject.org>
 Date: Mon, 19 Sep 2016 23:55:45 +0530
-Subject: [PATCH 1/5] virtio: add check for descriptor's mapped address
+Subject: [PATCH 4/7] virtio: add check for descriptor's mapped address
 
 virtio back end uses set of buffers to facilitate I/O operations.
 If its size is too large, 'cpu_physical_memory_map' could return
@@ -18,10 +18,10 @@ Reviewed-by: Laszlo Ersek <lersek@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
-index 111ad8e..75f5ada 100644
+index 74c085c..eabe573 100644
 --- a/hw/virtio/virtio.c
 +++ b/hw/virtio/virtio.c
-@@ -471,6 +471,11 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
+@@ -473,6 +473,11 @@ static void virtqueue_map_desc(unsigned int *p_num_sg, hwaddr *addr, struct iove
          }
  
          iov[num_sg].iov_base = cpu_physical_memory_map(pa, &len, is_write);