[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/8] audio: fix wavcapture segfault
From: |
Gerd Hoffmann |
Subject: |
[PULL 5/8] audio: fix wavcapture segfault |
Date: |
Tue, 26 May 2020 09:56:36 +0200 |
From: Bruce Rogers <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [PULL 0/8] Audio 20200526 patches, Gerd Hoffmann, 2020/05/26
- [PULL 5/8] audio: fix wavcapture segfault,
Gerd Hoffmann <=
- [PULL 2/8] hw/audio/gus: Use AUDIO_HOST_ENDIANNESS definition from 'audio/audio.h', Gerd Hoffmann, 2020/05/26
- [PULL 1/8] es1370: check total frame count against current frame, Gerd Hoffmann, 2020/05/26
- [PULL 7/8] audio: Let capture_callback handler use const buffer argument, Gerd Hoffmann, 2020/05/26
- [PULL 4/8] audio/mixeng: fix clang 10+ warning, Gerd Hoffmann, 2020/05/26
- [PULL 6/8] audio: Let audio_sample_to_uint64() use const samples argument, Gerd Hoffmann, 2020/05/26
- [PULL 8/8] hw/mips/mips_fulong2e: Remove unused 'audio/audio.h' include, Gerd Hoffmann, 2020/05/26
- [PULL 3/8] audio/jack: add JACK client audiodev, Gerd Hoffmann, 2020/05/26
- Re: [PULL 0/8] Audio 20200526 patches, Peter Maydell, 2020/05/26
- Re: [PULL 0/8] Audio 20200526 patches, Markus Armbruster, 2020/05/27