From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Prasad J Pandit" <pjp@fedoraproject.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 1/8] es1370: check total frame count against current frame
Date: Tue, 26 May 2020 09:56:32 +0200 [thread overview]
Message-ID: <20200526075639.27949-2-kraxel@redhat.com> (raw)
In-Reply-To: <20200526075639.27949-1-kraxel@redhat.com>
From: Prasad J Pandit <pjp@fedoraproject.org>
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>
---
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 89c4dabcd44f..5f8a83ff5624 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));
--
2.18.4
next prev parent reply other threads:[~2020-05-26 7:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 7:56 [PULL 0/8] Audio 20200526 patches Gerd Hoffmann
2020-05-26 7:56 ` Gerd Hoffmann [this message]
2020-05-26 7:56 ` [PULL 2/8] hw/audio/gus: Use AUDIO_HOST_ENDIANNESS definition from 'audio/audio.h' Gerd Hoffmann
2020-05-26 7:56 ` [PULL 3/8] audio/jack: add JACK client audiodev Gerd Hoffmann
2020-05-26 7:56 ` [PULL 4/8] audio/mixeng: fix clang 10+ warning Gerd Hoffmann
2020-05-26 7:56 ` [PULL 5/8] audio: fix wavcapture segfault Gerd Hoffmann
2020-05-26 7:56 ` [PULL 6/8] audio: Let audio_sample_to_uint64() use const samples argument Gerd Hoffmann
2020-05-26 7:56 ` [PULL 7/8] audio: Let capture_callback handler use const buffer argument Gerd Hoffmann
2020-05-26 7:56 ` [PULL 8/8] hw/mips/mips_fulong2e: Remove unused 'audio/audio.h' include Gerd Hoffmann
2020-05-26 13:05 ` [PULL 0/8] Audio 20200526 patches Peter Maydell
2020-05-27 6:30 ` Markus Armbruster
2020-05-27 9:56 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200526075639.27949-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=philmd@redhat.com \
--cc=pjp@fedoraproject.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).