ASoC: Intel: Fix pcm stream context restore crash
Subsystems (3)
PATCH 1/1 ASoC: Intel: Fix pcm stream context restore crash
From: Kevin Strasser <[email protected]>
In some cases the pcm stream is closed while context has been scheduled to be restored, causing a null pointer deref panic. Cancel work to ensure stream does not get freed while work is still active/pending.
Also, restoring the pcm context can be safely skipped after the stream has been stopped. Check if pcm stream is still running before restoring stream context to help pending work finish more quickly in stream close path.
---
For topic/intel branch since fixes issue in recently added suspend/resume code.
--- sound/soc/intel/sst-baytrail-pcm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/sst-baytrail-pcm.c +3 -1
@@ -164,7 +164,8 @@ static void sst_byt_pcm_work(struct work_struct *work)struct sst_byt_pcm_data *pcm_data = container_of(work, struct sst_byt_pcm_data, work); -sst_byt_pcm_restore_stream_context (pcm_data->substream); +if (snd_pcm_running (pcm_data->substream)) +sst_byt_pcm_restore_stream_context (pcm_data->substream); }static int sst_byt_pcm_trigger (struct snd_pcm_substream *substream,int cmd)
@@ -277,6 +278,7 @@ static int sst_byt_pcm_close(struct snd_pcm_substream *substream)dev_dbg (rtd->dev,"PCM: close\n" ); +cancel_work_sync (&pcm_data->work);mutex_lock (&pcm_data->mutex); ret =sst_byt_stream_free (byt, pcm_data->stream);if (ret <0 ) {
Signature · 1 line
2.0.0.rc2
Quoted 6 lines · Jarkko Nikula
From: Kevin Strasser <[email protected]>
In some cases the pcm stream is closed while context has been scheduled to be restored, causing a null pointer deref panic. Cancel work to ensure stream does not get freed while work is still active/pending.
Applied, thanks.