summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-23 01:22:02 -0400
committerMike Frysinger <vapier@gentoo.org>2016-03-23 01:22:02 -0400
commit346b8a658c0fb521e9a783699a678756765d8845 (patch)
tree2e3e3753a64f2e3467a7106d16abb8ce9e5c2db5 /app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch
parentnet-print/cups-filters: force newer poppler #546220 (diff)
downloadgentoo-346b8a658c0fb521e9a783699a678756765d8845.tar.gz
gentoo-346b8a658c0fb521e9a783699a678756765d8845.tar.bz2
gentoo-346b8a658c0fb521e9a783699a678756765d8845.zip
app-emulation/qemu: backport various upstream fixes
Diffstat (limited to 'app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch')
-rw-r--r--app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch
new file mode 100644
index 000000000000..61a52eee8088
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8613.patch
@@ -0,0 +1,35 @@
+From 36fef36b91f7ec0435215860f1458b5342ce2811 Mon Sep 17 00:00:00 2001
+From: P J P <ppandit@redhat.com>
+Date: Mon, 21 Dec 2015 15:13:13 +0530
+Subject: [PATCH] scsi: initialise info object with appropriate size
+
+While processing controller 'CTRL_GET_INFO' command, the routine
+'megasas_ctrl_get_info' overflows the '&info' object size. Use its
+appropriate size to null initialise it.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Message-Id: <alpine.LFD.2.20.1512211501420.22471@wniryva>
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: P J P <ppandit@redhat.com>
+---
+ hw/scsi/megasas.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
+index d7dc667..576f56c 100644
+--- a/hw/scsi/megasas.c
++++ b/hw/scsi/megasas.c
+@@ -718,7 +718,7 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
+ BusChild *kid;
+ int num_pd_disks = 0;
+
+- memset(&info, 0x0, cmd->iov_size);
++ memset(&info, 0x0, dcmd_size);
+ if (cmd->iov_size < dcmd_size) {
+ trace_megasas_dcmd_invalid_xfer_len(cmd->index, cmd->iov_size,
+ dcmd_size);
+--
+2.7.4
+