ASoC: wm_adsp: Check for buffer in trigger stop
Subsystems (3)
PATCH 1/3 ASoC: wm_adsp: Check for buffer in trigger stop
Trigger stop can be called in situations where trigger start failed and as such it can't be assumed the buffer is already attached to the compressed stream or a NULL pointer may be dereferenced.
--- sound/soc/codecs/wm_adsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +2 -1
@@ -3952,7 +3952,8 @@ int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd) }break ;case SNDRV_PCM_TRIGGER_STOP : -wm_adsp_buffer_clear (compr->buf); +if (wm_adsp_compr_attached (compr)) +wm_adsp_buffer_clear (compr->buf);break ;default : ret = -EINVAL ;
Signature · 1 line
2.11.0
PATCH 2/3 ASoC: wm_adsp: Remove redundant NULL check in wm_adsp_buffer_free
wm_adsp_compr_detach is NULL aware so there is no need to check for NULL before calling it, remove the redundant check.
--- sound/soc/codecs/wm_adsp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm_adsp.c +1 -2
@@ -3887,8 +3887,7 @@ static int wm_adsp_buffer_free(struct wm_adsp *dsp)struct wm_adsp_compr_buf *buf, *tmp;list_for_each_entry_safe (buf, tmp, &dsp->buffer_list, list) { -if (buf->compr) -wm_adsp_compr_detach (buf->compr); +wm_adsp_compr_detach (buf->compr);kfree (buf->name);kfree (buf->regions);
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: wm_adsp: Remove redundant NULL check in wm_adsp_buffer_free" to the asoc tree
The patch
ASoC: wm_adsp: Remove redundant NULL check in wm_adsp_buffer_free
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
26ffa016a3c1b34fbfcc8368edb315f2829504aeMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 2 Apr 2019 13:49:15 +0100
Subject: [PATCH] ASoC: wm_adsp: Remove redundant NULL check in
wm_adsp_buffer_free
wm_adsp_compr_detach is NULL aware so there is no need to check for NULL before calling it, remove the redundant check.
--- sound/soc/codecs/wm_adsp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wm_adsp.c +1 -2
@@ -3887,8 +3887,7 @@ static int wm_adsp_buffer_free(struct wm_adsp *dsp)struct wm_adsp_compr_buf *buf, *tmp;list_for_each_entry_safe (buf, tmp, &dsp->buffer_list, list) { -if (buf->compr) -wm_adsp_compr_detach (buf->compr); +wm_adsp_compr_detach (buf->compr);kfree (buf->name);kfree (buf->regions);
Signature · 1 line
2.20.1
PATCH 3/3 ASoC: wm_adsp: Make use of local variables
In reply to Charles KeepaxTidy up some instances of dereferencing to obtain things that are already stored in local variables.
--- sound/soc/codecs/wm_adsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +3 -3
@@ -3381,7 +3381,7 @@ static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)return -EINVAL ; compr->buf = buf; - compr->buf->compr = compr; + buf->compr = compr;return 0 ; }
@@ -4092,7 +4092,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, buf = compr->buf; -if (!compr->buf || compr->buf->error) { +if (!buf || buf->error) {snd_compr_stop_error (stream,SNDRV_PCM_STATE_XRUN ); ret = -EIO ; goto out;
@@ -4112,7 +4112,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream,if (buf->avail <wm_adsp_compr_frag_words (compr)) { ret =wm_adsp_buffer_get_error (buf);if (ret <0 ) { -if (compr->buf->error) +if (buf->error)snd_compr_stop_error (stream,SNDRV_PCM_STATE_XRUN ); goto out;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: wm_adsp: Make use of local variables" to the asoc tree
The patch
ASoC: wm_adsp: Make use of local variables
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
789b930a8f0de609fd2ef9f2ebf73726b7087feaMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 2 Apr 2019 13:49:16 +0100
Subject: [PATCH] ASoC: wm_adsp: Make use of local variables
Tidy up some instances of dereferencing to obtain things that are already stored in local variables.
--- sound/soc/codecs/wm_adsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +3 -3
@@ -3381,7 +3381,7 @@ static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)return -EINVAL ; compr->buf = buf; - compr->buf->compr = compr; + buf->compr = compr;return 0 ; }
@@ -4091,7 +4091,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, buf = compr->buf; -if (!compr->buf || compr->buf->error) { +if (!buf || buf->error) {snd_compr_stop_error (stream,SNDRV_PCM_STATE_XRUN ); ret = -EIO ; goto out;
@@ -4111,7 +4111,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream,if (buf->avail <wm_adsp_compr_frag_words (compr)) { ret =wm_adsp_buffer_get_error (buf);if (ret <0 ) { -if (compr->buf->error) +if (buf->error)snd_compr_stop_error (stream,SNDRV_PCM_STATE_XRUN ); goto out;
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: wm_adsp: Check for buffer in trigger stop" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Check for buffer in trigger stop
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
43d147be5738a9ed6cfb25c285ac50d6dd5793beMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 2 Apr 2019 13:49:14 +0100
Subject: [PATCH] ASoC: wm_adsp: Check for buffer in trigger stop
Trigger stop can be called in situations where trigger start failed and as such it can't be assumed the buffer is already attached to the compressed stream or a NULL pointer may be dereferenced.
--- sound/soc/codecs/wm_adsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +2 -1
@@ -3587,7 +3587,8 @@ int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd) }break ;case SNDRV_PCM_TRIGGER_STOP : -wm_adsp_buffer_clear (compr->buf); +if (wm_adsp_compr_attached (compr)) +wm_adsp_buffer_clear (compr->buf);break ;default : ret = -EINVAL ;
Signature · 1 line
2.20.1