ASoC: dpcm: acquire dpcm_lock in dpcm_do_trigger()
A message that is not in the archive (sent off-list or not yet received): CGME20201127014343epcas2p10bf524de048e0a659aa2486080375a75@epcas2p1.samsung.com
PATCH 1/1 ASoC: dpcm: acquire dpcm_lock in dpcm_do_trigger()
If stop by underrun and DPCM BE disconnection is run simultaneously, data abort can be occurred by the sequence below.
/* In core X, running dpcm_be_dai_trigger() */ for_each_dpcm_be(fe, stream, dpcm) {
/* In core Y, running dpcm_be_disconnect() */ spin_lock_irqsave(&fe->card->dpcm_lock, flags); list_del(&dpcm->list_be); list_del(&dpcm->list_fe); spin_unlock_irqrestore(&fe->card->dpcm_lock, flags); kfree(dpcm);
/* In core X, running dpcm_be_dai_trigger() */
struct snd_soc_pcm_runtime *be = dpcm->be; <== Accessing freed memory
To prevent this situation, dpcm_lock should be acquired during iteration of dpcm list in dpcm_do_trigger().
--- sound/soc/soc-pcm.c | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-)
sound/soc/soc-pcm.c +44 -18
@@ -2073,6 +2073,9 @@ static int dpcm_fe_dai_hw_params(struct snd_pcm_substream *substream,return ret; } +static int dpcm_can_be_free_stop (struct snd_soc_pcm_runtime *fe, +struct snd_soc_pcm_runtime *be,int stream); +static int dpcm_do_trigger (struct snd_soc_dpcm *dpcm,struct snd_pcm_substream *substream,int cmd) {
@@ -2092,8 +2095,10 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, int cmd) {struct snd_soc_dpcm *dpcm; +unsigned long flags;int ret =0 ; +spin_lock_irqsave (&fe->card->dpcm_lock, flags);for_each_dpcm_be (fe, stream, dpcm) {struct snd_soc_pcm_runtime *be = dpcm->be;
@@ -2113,7 +2118,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;
@@ -2123,7 +2128,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;
@@ -2133,7 +2138,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_START ;break ;
@@ -2142,12 +2147,12 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED)) continue; -if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) +if (!dpcm_can_be_free_stop (fe, be, stream))continue ; ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_STOP ;break ;
@@ -2155,12 +2160,12 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START )continue ; -if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) +if (!dpcm_can_be_free_stop (fe, be, stream))continue ; ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_SUSPEND ;break ;
@@ -2168,17 +2173,20 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,if (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_START )continue ; -if (!snd_soc_dpcm_can_be_free_stop (fe, be, stream)) +if (!dpcm_can_be_free_stop (fe, be, stream))continue ; ret =dpcm_do_trigger (dpcm, be_substream, cmd);if (ret) -return ret; +break ; be->dpcm[stream].state =SND_SOC_DPCM_STATE_PAUSED ;break ; } +if (ret) +break ; } +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);return ret; }
@@ -2916,10 +2924,9 @@ static int snd_soc_dpcm_check_state(struct snd_soc_pcm_runtime *fe,struct snd_soc_dpcm *dpcm;int state;int ret =1 ; -unsigned long flags;int i; -spin_lock_irqsave (&fe->card->dpcm_lock, flags); +lockdep_assert_held (&fe->card->dpcm_lock);for_each_dpcm_fe (be, stream, dpcm) {if (dpcm->fe == fe)
@@ -2933,17 +2940,12 @@ static int snd_soc_dpcm_check_state(struct snd_soc_pcm_runtime *fe, } } } -spin_unlock_irqrestore (&fe->card->dpcm_lock, flags);/* it's safe to do this BE DAI */ return ret; } -/* -* We can only hw_free, stop, pause or suspend a BE DAI if any of it's FE -* are not running, paused or suspended for the specified stream direction. -*/ -int snd_soc_dpcm_can_be_free_stop (struct snd_soc_pcm_runtime *fe, +static int dpcm_can_be_free_stop (struct snd_soc_pcm_runtime *fe,struct snd_soc_pcm_runtime *be,int stream) {const enum snd_soc_dpcm_state state[] = {
@@ -2954,6 +2956,23 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe,return snd_soc_dpcm_check_state (fe, be, stream, state,ARRAY_SIZE (state)); } + +/* +* We can only hw_free, stop, pause or suspend a BE DAI if any of it's FE +* are not running, paused or suspended for the specified stream direction. +*/ +int snd_soc_dpcm_can_be_free_stop (struct snd_soc_pcm_runtime *fe, +struct snd_soc_pcm_runtime *be,int stream) +{ +unsigned long flags; +int ret; + +spin_lock_irqsave (&fe->card->dpcm_lock, flags); + ret =dpcm_can_be_free_stop (fe, be, stream); +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags); + +return ret; +}EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_free_stop);/*
@@ -2963,6 +2982,9 @@ EXPORT_SYMBOL_GPL(snd_soc_dpcm_can_be_free_stop);int snd_soc_dpcm_can_be_params (struct snd_soc_pcm_runtime *fe,struct snd_soc_pcm_runtime *be,int stream) { +unsigned long flags; +int ret; +const enum snd_soc_dpcm_state state[] = {SND_SOC_DPCM_STATE_START ,SND_SOC_DPCM_STATE_PAUSED ,
@@ -2970,6 +2992,10 @@ int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,SND_SOC_DPCM_STATE_PREPARE , }; -return snd_soc_dpcm_check_state (fe, be, stream, state,ARRAY_SIZE (state)); +spin_lock_irqsave (&fe->card->dpcm_lock, flags); + ret =snd_soc_dpcm_check_state (fe, be, stream, state,ARRAY_SIZE (state)); +spin_unlock_irqrestore (&fe->card->dpcm_lock, flags); + +return ret; }EXPORT_SYMBOL_GPL (snd_soc_dpcm_can_be_params);
base-commit: fa02fcd94b0c8dff6cc65714510cf25ad194b90d
Signature · 1 line
2.21.0