[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring si
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring size |
Date: |
Thu, 15 Sep 2016 16:21:46 +0200 |
From: Prasad J Pandit <address@hidden>
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: address@hidden
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 babac5a..a5ce7de 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -247,8 +247,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 =
--
1.8.3.1
- [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 01/17] scsi-disk: Cleaning up around tray open state, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 03/17] scsi: mptsas: use g_new0 to allocate MPTSASRequest object, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 02/17] virtio-scsi: Don't abort when media is ejected, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 04/17] cutils: Rewrite x86 buffer zero checking, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 05/17] Change net/socket.c to use socket_*() functions, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 06/17] memory: remove memory_region_destructor_rom_device, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring size,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/17] pc: apic: fix touch LAPIC when irqchip is split, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 09/17] target-i386: fix ordering of fields in CPUX86State, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 10/17] linux-user: complete omission of removing uses of strdup, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 11/17] build-sys: add make 'help' target, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 12/17] qemu-char: avoid segfault if user lacks of permisson of a given logfile, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log args, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 15/17] pc: apic: introduce APIC macro, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 16/17] kvmvapic: fix state change handler, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 17/17] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2016/09/15