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
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
From 40b9ce117b5a3aced6e1b88ea0e2619170b202f6 Mon Sep 17 00:00:00 2001
|
|
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Mon, 6 Jun 2016 22:04:43 +0530
|
|
Subject: [PATCH] scsi: esp: check TI buffer index before read/write
|
|
|
|
The 53C9X Fast SCSI Controller(FSC) comes with internal 16-byte
|
|
FIFO buffers. One is used to handle commands and other is for
|
|
information transfer. Three control variables 'ti_rptr',
|
|
'ti_wptr' and 'ti_size' are used to control r/w access to the
|
|
information transfer buffer ti_buf[TI_BUFSZ=16]. In that,
|
|
|
|
'ti_rptr' is used as read index, where read occurs.
|
|
'ti_wptr' is a write index, where write would occur.
|
|
'ti_size' indicates total bytes to be read from the buffer.
|
|
|
|
While reading/writing to this buffer, index could exceed its
|
|
size. Add check to avoid OOB r/w access.
|
|
|
|
Reported-by: Huawei PSIRT <psirt@huawei.com>
|
|
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Message-Id: <1465230883-22303-1-git-send-email-ppandit@redhat.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit ff589551c8e8e9e95e211b9d8daafb4ed39f1aec)
|
|
[BR: CVE-2016-5338 BSC#983982]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/scsi/esp.c | 20 +++++++++-----------
|
|
1 file changed, 9 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
|
|
index 591c817..3adb685 100644
|
|
--- a/hw/scsi/esp.c
|
|
+++ b/hw/scsi/esp.c
|
|
@@ -400,19 +400,17 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
|
|
trace_esp_mem_readb(saddr, s->rregs[saddr]);
|
|
switch (saddr) {
|
|
case ESP_FIFO:
|
|
- if (s->ti_size > 0) {
|
|
+ if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
|
|
+ /* Data out. */
|
|
+ qemu_log_mask(LOG_UNIMP, "esp: PIO data read not implemented\n");
|
|
+ s->rregs[ESP_FIFO] = 0;
|
|
+ esp_raise_irq(s);
|
|
+ } else if (s->ti_rptr < s->ti_wptr) {
|
|
s->ti_size--;
|
|
- if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
|
|
- /* Data out. */
|
|
- qemu_log_mask(LOG_UNIMP,
|
|
- "esp: PIO data read not implemented\n");
|
|
- s->rregs[ESP_FIFO] = 0;
|
|
- } else {
|
|
- s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
|
|
- }
|
|
+ s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
|
|
esp_raise_irq(s);
|
|
}
|
|
- if (s->ti_size == 0) {
|
|
+ if (s->ti_rptr == s->ti_wptr) {
|
|
s->ti_rptr = 0;
|
|
s->ti_wptr = 0;
|
|
}
|
|
@@ -456,7 +454,7 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
|
|
} else {
|
|
trace_esp_error_fifo_overrun();
|
|
}
|
|
- } else if (s->ti_size == TI_BUFSZ - 1) {
|
|
+ } else if (s->ti_wptr == TI_BUFSZ - 1) {
|
|
trace_esp_error_fifo_overrun();
|
|
} else {
|
|
s->ti_size++;
|