diff mbox

ASoC: Intel: Fix pcm stream context restore crash

Message ID 1400487263-3951-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive)
State Accepted
Commit 2fa190ce33bdf2f58bb0a65d94e08980d92c76ed
Headers show

Commit Message

Jarkko Nikula May 19, 2014, 8:14 a.m. UTC 
From: Kevin Strasser <kevin.strasser@intel.com>

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.

Signed-off-by: Kevin Strasser <kevin.strasser@intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
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(-)

Comments

Mark Brown May 19, 2014, 4:30 p.m. UTC | #1 
On Mon, May 19, 2014 at 11:14:23AM +0300, Jarkko Nikula wrote:
> From: Kevin Strasser <kevin.strasser@intel.com>
> 
> 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.
diff mbox

Patch

diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 6242ccce2bb7..3af38576e91e 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -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) {