Skip to contentSkip to conversation

audio: fix wavcapture segfault

PATCH In review Bruce Rogers 3 participants 3 messages May 21, 2020 – May 26, 2020

lore
Share & tools
lore
#0 lore raw

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().

Fixes 571a8c522e (audio: split ctl_* functions into enable_* and

volume_*)

---
 audio/audio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
audio/audio.c +2 -2
index 7a9e680355..08a067722b 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 28 lines · Bruce Rogers

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_*)

---
  audio/audio.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
audio/audio.c +1 -1
index 7a9e680355..08a067722b 100644
@@ -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);
          }
      }
#2 lore raw
In reply to Bruce Rogers
Quoted 9 lines · Bruce Rogers

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_*)

Added to audio queue.

thanks,
Gerd