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
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 9e91782f3582e12f5c41e64f70e5c53f0e7b9f2a Mon Sep 17 00:00:00 2001
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Tue, 24 May 2016 02:10:00 -0600
|
|
Subject: [PATCH] scsi: mptsas: infinite loop while fetching requests
|
|
|
|
The LSI SAS1068 Host Bus Adapter emulator in Qemu, periodically
|
|
looks for requests and fetches them. A loop doing that in
|
|
mptsas_fetch_requests() could run infinitely if 's->state' was
|
|
not operational. Move check to avoid such a loop.
|
|
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
[BR: CVE-2016-4964 BSC#981399]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/scsi/mptsas.c | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
|
|
index 499c146..be88e16 100644
|
|
--- a/hw/scsi/mptsas.c
|
|
+++ b/hw/scsi/mptsas.c
|
|
@@ -754,11 +754,6 @@ static void mptsas_fetch_request(MPTSASState *s)
|
|
hwaddr addr;
|
|
int size;
|
|
|
|
- if (s->state != MPI_IOC_STATE_OPERATIONAL) {
|
|
- mptsas_set_fault(s, MPI_IOCSTATUS_INVALID_STATE);
|
|
- return;
|
|
- }
|
|
-
|
|
/* Read the message header from the guest first. */
|
|
addr = s->host_mfa_high_addr | MPTSAS_FIFO_GET(s, request_post);
|
|
pci_dma_read(pci, addr, req, sizeof(hdr));
|
|
@@ -789,6 +784,10 @@ static void mptsas_fetch_requests(void *opaque)
|
|
{
|
|
MPTSASState *s = opaque;
|
|
|
|
+ if (s->state != MPI_IOC_STATE_OPERATIONAL) {
|
|
+ mptsas_set_fault(s, MPI_IOCSTATUS_INVALID_STATE);
|
|
+ return;
|
|
+ }
|
|
while (!MPTSAS_FIFO_EMPTY(s, request_post)) {
|
|
mptsas_fetch_request(s);
|
|
}
|