|
 |
cf91b1d |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
cf91b1d |
Date: Mon, 23 May 2016 16:18:05 +0530
|
|
|
cf91b1d |
Subject: [PATCH] scsi: pvscsi: check command descriptor ring buffer size
|
|
|
cf91b1d |
(CVE-2016-4952)
|
|
|
cf91b1d |
|
|
|
cf91b1d |
Vmware Paravirtual SCSI emulation uses command descriptors to
|
|
|
cf91b1d |
process SCSI commands. These descriptors come with their ring
|
|
|
cf91b1d |
buffers. A guest could set the ring buffer size to an arbitrary
|
|
|
cf91b1d |
value leading to OOB access issue. Add check to avoid it.
|
|
|
cf91b1d |
|
|
|
cf91b1d |
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
|
cf91b1d |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
cf91b1d |
Cc: qemu-stable@nongnu.org
|
|
|
cf91b1d |
Message-Id: <1464000485-27041-1-git-send-email-ppandit@redhat.com>
|
|
|
cf91b1d |
Reviewed-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
|
|
|
cf91b1d |
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
|
|
|
cf91b1d |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
cf91b1d |
(cherry picked from commit 3e831b40e015ba34dfb55ff11f767001839425ff)
|
|
|
cf91b1d |
---
|
|
|
cf91b1d |
hw/scsi/vmw_pvscsi.c | 24 ++++++++++++++++++++----
|
|
|
cf91b1d |
1 file changed, 20 insertions(+), 4 deletions(-)
|
|
|
cf91b1d |
|
|
|
cf91b1d |
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
|
|
|
cf91b1d |
index e690b4e..e1d6d06 100644
|
|
|
cf91b1d |
--- a/hw/scsi/vmw_pvscsi.c
|
|
|
cf91b1d |
+++ b/hw/scsi/vmw_pvscsi.c
|
|
|
cf91b1d |
@@ -153,7 +153,7 @@ pvscsi_log2(uint32_t input)
|
|
|
cf91b1d |
return log;
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
|
|
|
cf91b1d |
-static void
|
|
|
cf91b1d |
+static int
|
|
|
cf91b1d |
pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
|
cf91b1d |
{
|
|
|
cf91b1d |
int i;
|
|
|
cf91b1d |
@@ -161,6 +161,10 @@ pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
|
cf91b1d |
uint32_t req_ring_size, cmp_ring_size;
|
|
|
cf91b1d |
m->rs_pa = ri->ringsStatePPN << VMW_PAGE_SHIFT;
|
|
|
cf91b1d |
|
|
|
cf91b1d |
+ if ((ri->reqRingNumPages > PVSCSI_SETUP_RINGS_MAX_NUM_PAGES)
|
|
|
cf91b1d |
+ || (ri->cmpRingNumPages > PVSCSI_SETUP_RINGS_MAX_NUM_PAGES)) {
|
|
|
cf91b1d |
+ return -1;
|
|
|
cf91b1d |
+ }
|
|
|
cf91b1d |
req_ring_size = ri->reqRingNumPages * PVSCSI_MAX_NUM_REQ_ENTRIES_PER_PAGE;
|
|
|
cf91b1d |
cmp_ring_size = ri->cmpRingNumPages * PVSCSI_MAX_NUM_CMP_ENTRIES_PER_PAGE;
|
|
|
cf91b1d |
txr_len_log2 = pvscsi_log2(req_ring_size - 1);
|
|
|
cf91b1d |
@@ -192,15 +196,20 @@ pvscsi_ring_init_data(PVSCSIRingInfo *m, PVSCSICmdDescSetupRings *ri)
|
|
|
cf91b1d |
|
|
|
cf91b1d |
/* Flush ring state page changes */
|
|
|
cf91b1d |
smp_wmb();
|
|
|
cf91b1d |
+
|
|
|
cf91b1d |
+ return 0;
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
|
|
|
cf91b1d |
-static void
|
|
|
cf91b1d |
+static int
|
|
|
cf91b1d |
pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri)
|
|
|
cf91b1d |
{
|
|
|
cf91b1d |
int i;
|
|
|
cf91b1d |
uint32_t len_log2;
|
|
|
cf91b1d |
uint32_t ring_size;
|
|
|
cf91b1d |
|
|
|
cf91b1d |
+ if (ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) {
|
|
|
cf91b1d |
+ return -1;
|
|
|
cf91b1d |
+ }
|
|
|
cf91b1d |
ring_size = ri->numPages * PVSCSI_MAX_NUM_MSG_ENTRIES_PER_PAGE;
|
|
|
cf91b1d |
len_log2 = pvscsi_log2(ring_size - 1);
|
|
|
cf91b1d |
|
|
|
cf91b1d |
@@ -220,6 +229,8 @@ pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri)
|
|
|
cf91b1d |
|
|
|
cf91b1d |
/* Flush ring state page changes */
|
|
|
cf91b1d |
smp_wmb();
|
|
|
cf91b1d |
+
|
|
|
cf91b1d |
+ return 0;
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
|
|
|
cf91b1d |
static void
|
|
|
cf91b1d |
@@ -770,7 +781,10 @@ pvscsi_on_cmd_setup_rings(PVSCSIState *s)
|
|
|
cf91b1d |
trace_pvscsi_on_cmd_arrived("PVSCSI_CMD_SETUP_RINGS");
|
|
|
cf91b1d |
|
|
|
cf91b1d |
pvscsi_dbg_dump_tx_rings_config(rc);
|
|
|
cf91b1d |
- pvscsi_ring_init_data(&s->rings, rc);
|
|
|
cf91b1d |
+ if (pvscsi_ring_init_data(&s->rings, rc) < 0) {
|
|
|
cf91b1d |
+ return PVSCSI_COMMAND_PROCESSING_FAILED;
|
|
|
cf91b1d |
+ }
|
|
|
cf91b1d |
+
|
|
|
cf91b1d |
s->rings_info_valid = TRUE;
|
|
|
cf91b1d |
return PVSCSI_COMMAND_PROCESSING_SUCCEEDED;
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
@@ -850,7 +864,9 @@ pvscsi_on_cmd_setup_msg_ring(PVSCSIState *s)
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
|
|
|
cf91b1d |
if (s->rings_info_valid) {
|
|
|
cf91b1d |
- pvscsi_ring_init_msg(&s->rings, rc);
|
|
|
cf91b1d |
+ if (pvscsi_ring_init_msg(&s->rings, rc) < 0) {
|
|
|
cf91b1d |
+ return PVSCSI_COMMAND_PROCESSING_FAILED;
|
|
|
cf91b1d |
+ }
|
|
|
cf91b1d |
s->msg_ring_info_valid = TRUE;
|
|
|
cf91b1d |
}
|
|
|
cf91b1d |
return sizeof(PVSCSICmdDescSetupMsgRing) / sizeof(uint32_t);
|