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
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From e9910b20f94d3683d4d8895136583529cf7c313f Mon Sep 17 00:00:00 2001
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Wed, 25 May 2016 17:55:10 +0530
|
|
Subject: [PATCH] scsi: megasas: check 'read_queue_head' index value
|
|
|
|
While doing MegaRAID SAS controller command frame lookup, routine
|
|
'megasas_lookup_frame' uses 'read_queue_head' value as an index
|
|
into 'frames[MEGASAS_MAX_FRAMES=2048]' array. Limit its value
|
|
within array bounds to avoid any OOB access.
|
|
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Message-Id: <1464179110-18593-1-git-send-email-ppandit@redhat.com>
|
|
Reviewed-by: Alexander Graf <agraf@suse.de>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit b60bdd1f1ee1616b7a9aeeffb4088e1ce2710fb2)
|
|
[BR: CVE-2016-5107 BSC#982019]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/scsi/megasas.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
|
|
index dcbd3e1..96aee1c 100644
|
|
--- a/hw/scsi/megasas.c
|
|
+++ b/hw/scsi/megasas.c
|
|
@@ -650,7 +650,9 @@ static int megasas_init_firmware(MegasasState *s, MegasasCmd *cmd)
|
|
pa_hi = le32_to_cpu(initq->pi_addr_hi);
|
|
s->producer_pa = ((uint64_t) pa_hi << 32) | pa_lo;
|
|
s->reply_queue_head = ldl_le_pci_dma(pcid, s->producer_pa);
|
|
+ s->reply_queue_head %= MEGASAS_MAX_FRAMES;
|
|
s->reply_queue_tail = ldl_le_pci_dma(pcid, s->consumer_pa);
|
|
+ s->reply_queue_tail %= MEGASAS_MAX_FRAMES;
|
|
flags = le32_to_cpu(initq->flags);
|
|
if (flags & MFI_QUEUE_FLAG_CONTEXT64) {
|
|
s->flags |= MEGASAS_MASK_USE_QUEUE64;
|