audio: fix wavcapture segfault
PATCH 1/1 audio: fix wavcapture segfault
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().
volume_*)
--- audio/audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
audio/audio.c +2 -2
@@ -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); } }
Signature · 1 line
2.26.2
Quoted 28 lines · Bruce Rogers
Commit
571a8c522ecaused the HMP wavcapture command to segfault when processing audio data inaudio_pcm_sw_write(), where a NULLsw->hw->pcm_opsis dereferenced. This fix checks that the pointer is valid before dereferincing it. A similar fix is also made in the parallel functionaudio_pcm_sw_read().Fixes 571a8c522e (audio: split ctl_* functions into enable_* andvolume_*)
Signed-off-by Bruce Rogers <[email protected]>--- audio/audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)audio/audio.c +1
-1@@ -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); }
audio/audio.c static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size) · line 742
Quoted 8 lines
audio/audio.c +1
-1@@ -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); } }
Quoted 9 lines · Bruce Rogers
Commit
571a8c522ecaused the HMP wavcapture command to segfault when processing audio data inaudio_pcm_sw_write(), where a NULLsw->hw->pcm_opsis dereferenced. This fix checks that the pointer is valid before dereferincing it. A similar fix is also made in the parallel functionaudio_pcm_sw_read().Fixes 571a8c522e (audio: split ctl_* functions into enable_* andvolume_*)
Signed-off-by Bruce Rogers <[email protected]>
Added to audio queue.
thanks,
Gerd