1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Fri, 15 May 2020 01:36:08 +0530
|
|
Subject: es1370: check total frame count against current frame
|
|
|
|
Git-commit: 369ff955a8497988d079c4e3fa1e93c2570c1c69
|
|
References: bsc#1172384, CVE-2020-13361
|
|
|
|
A guest user may set channel frame count via es1370_write()
|
|
such that, in es1370_transfer_audio(), total frame count
|
|
'size' is lesser than the number of frames that are processed
|
|
'cnt'.
|
|
|
|
int cnt = d->frame_cnt >> 16;
|
|
int size = d->frame_cnt & 0xffff;
|
|
|
|
if (size < cnt), it results in incorrect calculations leading
|
|
to OOB access issue(s). Add check to avoid it.
|
|
|
|
Reported-by: Ren Ding <rding@gatech.edu>
|
|
Reported-by: Hanqing Zhao <hanqing@gatech.edu>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Message-id: 20200514200608.1744203-1-ppandit@redhat.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/audio/es1370.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
|
|
index 89c4dabcd44fb2d7782e3cabc51d..5f8a83ff56241d94347c1e51419e 100644
|
|
--- a/hw/audio/es1370.c
|
|
+++ b/hw/audio/es1370.c
|
|
@@ -643,6 +643,9 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
|
|
int csc_bytes = (csc + 1) << d->shift;
|
|
int cnt = d->frame_cnt >> 16;
|
|
int size = d->frame_cnt & 0xffff;
|
|
+ if (size < cnt) {
|
|
+ return;
|
|
+ }
|
|
int left = ((size - cnt + 1) << 2) + d->leftover;
|
|
int transferred = 0;
|
|
int temp = MIN (max, MIN (left, csc_bytes));
|
|
@@ -651,7 +654,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
|
|
addr += (cnt << 2) + d->leftover;
|
|
|
|
if (index == ADC_CHANNEL) {
|
|
- while (temp) {
|
|
+ while (temp > 0) {
|
|
int acquired, to_copy;
|
|
|
|
to_copy = MIN ((size_t) temp, sizeof (tmpbuf));
|
|
@@ -669,7 +672,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel,
|
|
else {
|
|
SWVoiceOut *voice = s->dac_voice[index];
|
|
|
|
- while (temp) {
|
|
+ while (temp > 0) {
|
|
int copied, to_copy;
|
|
|
|
to_copy = MIN ((size_t) temp, sizeof (tmpbuf));
|