8c721a87ae
- Remove deprecated patch "work-around-SA_RESTART-race" (boo#982208) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 * Patches dropped: 0002-XXX-work-around-SA_RESTART-race-wit.patch 0003-qemu-0.9.0.cvs-binfmt.patch 0004-qemu-cvs-alsa_bitfield.patch 0005-qemu-cvs-alsa_ioctl.patch 0006-qemu-cvs-alsa_mmap.patch 0007-qemu-cvs-gettimeofday.patch 0008-qemu-cvs-ioctl_debug.patch 0009-qemu-cvs-ioctl_nodirection.patch 0010-block-vmdk-Support-creation-of-SCSI.patch 0011-linux-user-add-binfmt-wrapper-for-a.patch 0012-PPC-KVM-Disable-mmu-notifier-check.patch 0013-linux-user-fix-segfault-deadlock.patch 0014-linux-user-binfmt-support-host-bina.patch 0015-linux-user-Ignore-broken-loop-ioctl.patch 0016-linux-user-lock-tcg.patch 0017-linux-user-Run-multi-threaded-code-.patch 0018-linux-user-lock-tb-flushing-too.patch 0019-linux-user-Fake-proc-cpuinfo.patch 0020-linux-user-implement-FS_IOC_GETFLAG.patch 0021-linux-user-implement-FS_IOC_SETFLAG.patch 0022-linux-user-XXX-disable-fiemap.patch 0023-slirp-nooutgoing.patch 0024-vnc-password-file-and-incoming-conn.patch 0025-linux-user-add-more-blk-ioctls.patch 0026-linux-user-use-target_ulong.patch 0027-block-Add-support-for-DictZip-enabl.patch 0028-block-Add-tar-container-format.patch OBS-URL: https://build.opensuse.org/request/show/408549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=305
97 lines
3.1 KiB
Diff
97 lines
3.1 KiB
Diff
From 8c2fc88049f351c67bd82c6f61c54111eb088e69 Mon Sep 17 00:00:00 2001
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Mon, 23 May 2016 04:49:00 -0600
|
|
Subject: [PATCH] scsi: pvscsi: check command descriptor ring buffer size
|
|
|
|
Vmware Paravirtual SCSI emulation uses command descriptors to
|
|
process SCSI commands. These descriptors come with their ring
|
|
buffers. A guest could set the ring buffer size to an arbitrary
|
|
value leading to OOB access issue. Add check to avoid it.
|
|
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
[BR: CVE-2016-4952 BSC#981266]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/scsi/vmw_pvscsi.c | 24 ++++++++++++++++++++----
|
|
1 file changed, 20 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
|
|
index e690b4e..e1d6d06 100644
|
|
--- a/hw/scsi/vmw_pvscsi.c
|
|
+++ b/hw/scsi/vmw_pvscsi.c
|
|
@@ -153,7 +153,7 @@ pvscsi_log2(uint32_t input)
|
|
return log;
|
|
}
|
|
|
|
-static void
|
|
+static int
|
|
pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
{
|
|
int i;
|
|
@@ -161,6 +161,10 @@ pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
uint32_t req_ring_size, cmp_ring_size;
|
|
m->rs_pa = ri->ringsStatePPN << VMW_PAGE_SHIFT;
|
|
|
|
+ if ((ri->reqRingNumPages > PVSCSI_SETUP_RINGS_MAX_NUM_PAGES)
|
|
+ || (ri->cmpRingNumPages > PVSCSI_SETUP_RINGS_MAX_NUM_PAGES)) {
|
|
+ return -1;
|
|
+ }
|
|
req_ring_size = ri->reqRingNumPages * PVSCSI_MAX_NUM_REQ_ENTRIES_PER_PAGE;
|
|
cmp_ring_size = ri->cmpRingNumPages * PVSCSI_MAX_NUM_CMP_ENTRIES_PER_PAGE;
|
|
txr_len_log2 = pvscsi_log2(req_ring_size - 1);
|
|
@@ -192,15 +196,20 @@ pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
|
|
/* Flush ring state page changes */
|
|
smp_wmb();
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
-static void
|
|
+static int
|
|
pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri)
|
|
{
|
|
int i;
|
|
uint32_t len_log2;
|
|
uint32_t ring_size;
|
|
|
|
+ if (ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) {
|
|
+ return -1;
|
|
+ }
|
|
ring_size = ri->numPages * PVSCSI_MAX_NUM_MSG_ENTRIES_PER_PAGE;
|
|
len_log2 = pvscsi_log2(ring_size - 1);
|
|
|
|
@@ -220,6 +229,8 @@ pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri)
|
|
|
|
/* Flush ring state page changes */
|
|
smp_wmb();
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static void
|
|
@@ -770,7 +781,10 @@ pvscsi_on_cmd_setup_rings(PVSCSIState *s)
|
|
trace_pvscsi_on_cmd_arrived("PVSCSI_CMD_SETUP_RINGS");
|
|
|
|
pvscsi_dbg_dump_tx_rings_config(rc);
|
|
- pvscsi_ring_init_data(&s->rings, rc);
|
|
+ if (pvscsi_ring_init_data(&s->rings, rc) < 0) {
|
|
+ return PVSCSI_COMMAND_PROCESSING_FAILED;
|
|
+ }
|
|
+
|
|
s->rings_info_valid = TRUE;
|
|
return PVSCSI_COMMAND_PROCESSING_SUCCEEDED;
|
|
}
|
|
@@ -850,7 +864,9 @@ pvscsi_on_cmd_setup_msg_ring(PVSCSIState *s)
|
|
}
|
|
|
|
if (s->rings_info_valid) {
|
|
- pvscsi_ring_init_msg(&s->rings, rc);
|
|
+ if (pvscsi_ring_init_msg(&s->rings, rc) < 0) {
|
|
+ return PVSCSI_COMMAND_PROCESSING_FAILED;
|
|
+ }
|
|
s->msg_ring_info_valid = TRUE;
|
|
}
|
|
return sizeof(PVSCSICmdDescSetupMsgRing) / sizeof(uint32_t);
|