From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Bruce Rogers <brogers@suse.com>, qemu-devel@nongnu.org
Cc: kraxel@redhat.com, dirty.ice.hu@gmail.com
Subject: Re: [PATCH] audio: fix wavcapture segfault
Date: Thu, 21 May 2020 22:09:05 +0200 [thread overview]
Message-ID: <cb96a6b7-8dd4-1cef-f7de-2149b29a0192@redhat.com> (raw)
In-Reply-To: <20200521172931.121903-1-brogers@suse.com>
On 5/21/20 7:29 PM, Bruce Rogers wrote:
> 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>
> ---
> audio/audio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 7a9e680355..08a067722b 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);
> }
> }
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2020-05-21 20:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 17:29 [PATCH] audio: fix wavcapture segfault Bruce Rogers
2020-05-21 20:09 ` Philippe Mathieu-Daudé [this message]
2020-05-26 5: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=cb96a6b7-8dd4-1cef-f7de-2149b29a0192@redhat.com \
--to=philmd@redhat.com \
--cc=brogers@suse.com \
--cc=dirty.ice.hu@gmail.com \
--cc=kraxel@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).