From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Bruce Rogers" <brogers@suse.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 5/8] audio: fix wavcapture segfault
Date: Tue, 26 May 2020 09:56:36 +0200 [thread overview]
Message-ID: <20200526075639.27949-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200526075639.27949-1-kraxel@redhat.com>
From: Bruce Rogers <brogers@suse.com>
Commit 571a8c522e caused the HMP wavcapture command to segfault when
processing audio data in audio_pcm_sw_write(), where a NULL
sw->hw->pcm_ops is dereferenced. This fix checks that the pointer is
valid before dereferincing it. A similar fix is also made in the
parallel function audio_pcm_sw_read().
Fixes: 571a8c522e (audio: split ctl_* functions into enable_* and
volume_*)
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200521172931.121903-1-brogers@suse.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 95d9fb16caa5..ce8c6dec5f47 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -649,7 +649,7 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size)
total += isamp;
}
- if (!hw->pcm_ops->volume_in) {
+ if (hw->pcm_ops && !hw->pcm_ops->volume_in) {
mixeng_volume (sw->buf, ret, &sw->vol);
}
@@ -736,7 +736,7 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size)
if (swlim) {
sw->conv (sw->buf, buf, swlim);
- if (!sw->hw->pcm_ops->volume_out) {
+ if (sw->hw->pcm_ops && !sw->hw->pcm_ops->volume_out) {
mixeng_volume (sw->buf, swlim, &sw->vol);
}
}
--
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 ` [PULL 1/8] es1370: check total frame count against current frame Gerd Hoffmann
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 ` Gerd Hoffmann [this message]
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-6-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=brogers@suse.com \
--cc=philmd@redhat.com \
--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).