summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorP J P <ppandit@redhat.com>2017-04-25 18:36:23 +0530
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-08-31 11:51:16 -0500
commit40a7d47c5a88e4045b471dff38182d5a21cae682 (patch)
tree811dcb406ec157911c86d20d169fe81afb642592
parent9b9b4423d7c868309df4b142527310a60584b4d2 (diff)
downloadqemu-40a7d47c5a88e4045b471dff38182d5a21cae682.tar.gz
vmw_pvscsi: check message ring page count at initialisation
A guest could set the message ring page count to zero, resulting in infinite loop. Add check to avoid it. Reported-by: YY Z <bigbird475958471@gmail.com> Signed-off-by: P J P <ppandit@redhat.com> Message-Id: <20170425130623.3649-1-ppandit@redhat.com> Reviewed-by: Dmitry Fleytman <dmitry@daynix.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit f68826989cd4d1217797251339579c57b3c0934e) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--hw/scsi/vmw_pvscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 75575461e2..4a106da856 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -202,7 +202,7 @@ pvscsi_ring_init_msg(PVSCSIRingInfo *m, PVSCSICmdDescSetupMsgRing *ri)
uint32_t len_log2;
uint32_t ring_size;
- if (ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) {
+ if (!ri->numPages || ri->numPages > PVSCSI_SETUP_MSG_RING_MAX_NUM_PAGES) {
return -1;
}
ring_size = ri->numPages * PVSCSI_MAX_NUM_MSG_ENTRIES_PER_PAGE;