39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
From a6cfc94b9a325993d6d77022ae8d0fd0cc77d117 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Date: Wed, 14 Sep 2016 15:09:12 +0530
|
||
|
|
Subject: [PATCH] scsi: pvscsi: limit process IO loop to ring size
|
||
|
|
|
||
|
|
Vmware Paravirtual SCSI emulator while processing IO requests
|
||
|
|
could run into an infinite loop if 'pvscsi_ring_pop_req_descr'
|
||
|
|
always returned positive value. Limit IO loop to the ring size.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
||
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
||
|
|
Message-Id: <1473845952-30785-1-git-send-email-ppandit@redhat.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit d251157ac1928191af851d199a9ff255d330bec9)
|
||
|
|
[BR: CVE-2016-7421 BSC#999661]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
hw/scsi/vmw_pvscsi.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
|
||
|
|
index 73679f8..efa5459 100644
|
||
|
|
--- a/hw/scsi/vmw_pvscsi.c
|
||
|
|
+++ b/hw/scsi/vmw_pvscsi.c
|
||
|
|
@@ -253,8 +253,11 @@ static hwaddr
|
||
|
|
pvscsi_ring_pop_req_descr(PVSCSIRingInfo *mgr)
|
||
|
|
{
|
||
|
|
uint32_t ready_ptr = RS_GET_FIELD(mgr, reqProdIdx);
|
||
|
|
+ uint32_t ring_size = PVSCSI_MAX_NUM_PAGES_REQ_RING
|
||
|
|
+ * PVSCSI_MAX_NUM_REQ_ENTRIES_PER_PAGE;
|
||
|
|
|
||
|
|
- if (ready_ptr != mgr->consumed_ptr) {
|
||
|
|
+ if (ready_ptr != mgr->consumed_ptr
|
||
|
|
+ && ready_ptr - mgr->consumed_ptr < ring_size) {
|
||
|
|
uint32_t next_ready_ptr =
|
||
|
|
mgr->consumed_ptr++ & mgr->txr_len_mask;
|
||
|
|
uint32_t next_ready_page =
|