[alsa-devel] [PATCH v2 03/10] ALSA: usb-audio: prevent NULL dereference on stop trigger
Eldad Zack
eldad at fogrefinery.com
Wed Aug 21 23:37:58 CEST 2013
If an endpoint uses another endpoint for synchronization, and the
other endpoint is stopped, an oops will occur on NULL dereference.
Clearing the prepare/retire callbacks solves this issue.
Signed-off-by: Eldad Zack <eldad at fogrefinery.com>
---
sound/usb/pcm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 9ec401a..19b0eb4 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -1199,6 +1199,8 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
subs->interface = -1;
}
+ subs->data_endpoint->prepare_data_urb = NULL;
+ subs->data_endpoint->retire_data_urb = NULL;
subs->pcm_substream = NULL;
snd_usb_autosuspend(subs->stream->chip);
@@ -1525,6 +1527,8 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea
subs->running = 1;
return 0;
case SNDRV_PCM_TRIGGER_STOP:
+ subs->data_endpoint->prepare_data_urb = NULL;
+ subs->data_endpoint->retire_data_urb = NULL;
stop_endpoints(subs, false);
subs->running = 0;
return 0;
@@ -1555,6 +1559,7 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream
subs->running = 1;
return 0;
case SNDRV_PCM_TRIGGER_STOP:
+ subs->data_endpoint->retire_data_urb = NULL;
stop_endpoints(subs, false);
subs->running = 0;
return 0;
--
1.8.1.5
More information about the Alsa-devel
mailing list