ASoC: soc-generic-dmaengine-pcm: Fix error handling
Subsystems (3)
PATCH 1/2 ASoC: soc-generic-dmaengine-pcm: Fix error handling
From: Fabio Estevam <[email protected]>
When dmaengine_pcm_request_chan_of() fails it should release the previously acquired resources, which in this case is to call kfree(pcm), so jump to the correct point in the error path.
--- sound/soc/soc-generic-dmaengine-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-generic-dmaengine-pcm.c +2 -1
@@ -450,7 +450,7 @@ int snd_dmaengine_pcm_register(struct device *dev, ret =dmaengine_pcm_request_chan_of (pcm, dev, config);if (ret) - goto err_free_dma; + goto err_free_pcm; ret =snd_soc_add_component (dev, &pcm->component, &dmaengine_pcm_component,NULL ,0 );
@@ -461,6 +461,7 @@ int snd_dmaengine_pcm_register(struct device *dev, err_free_dma:dmaengine_pcm_release_chan (pcm); +err_free_pcm:kfree (pcm);return ret; }
Signature · 1 line
2.7.4
PATCH 2/2 ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings
From: Fabio Estevam <[email protected]>
Currently the following sparse warnings are observed:
sound/soc/soc-generic-dmaengine-pcm.c:185:34: warning: restricted snd_pcm_format_t degrades to integer sound/soc/soc-generic-dmaengine-pcm.c:186:66: warning: incorrect type in argument 1 (different base types)sound/soc/soc-generic-dmaengine-pcm.c:186:66: expected restricted snd_pcm_format_t [usertype] formatsound/soc/soc-generic-dmaengine-pcm.c:186:66: got int [signed] [assigned] i
Fix it by changing the loop variable to be of 'snd_pcm_format_t'.
Also introduce a SNDRV_PCM_FORMAT_FIRST label, which corresponds to the first member (index 0) of the snd_pcm_format_t formats.
--- include/uapi/sound/asound.h | 1 + sound/soc/soc-generic-dmaengine-pcm.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
include/uapi/sound/asound.h +1 -0
@@ -242,6 +242,7 @@ typedef int __bitwise snd_pcm_format_t;#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51)/* DSD, 2-byte samples DSD (x16), big endian */ #define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52)/* DSD, 4-byte samples DSD (x32), big endian */ #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE +#define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8#ifdef SNDRV_LITTLE_ENDIAN #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
sound/soc/soc-generic-dmaengine-pcm.c +3 -2
@@ -132,7 +132,8 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substreau32 addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ) |BIT (DMA_SLAVE_BUSWIDTH_2_BYTES ) |BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); -int i, ret; +snd_pcm_format_t i; +int ret;if (pcm->config && pcm->config->pcm_hardware) return snd_soc_set_runtime_hwparams(substream,
@@ -182,7 +183,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea* default assumption is that it supports 1, 2 and 4 bytes * widths. */ -for (i =0 ; i <=SNDRV_PCM_FORMAT_LAST ; i++) { +for (i =SNDRV_PCM_FORMAT_FIRST ; i <=SNDRV_PCM_FORMAT_LAST ; i++) {int bits =snd_pcm_format_physical_width (i);/*
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings" to the asoc tree
The patch
ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings
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
7ed310bd51bec0b440a551fc4da1993c7f6cd231Mon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Thu, 22 Feb 2018 16:02:22 -0300
Subject: [PATCH] ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings
Currently the following sparse warnings are observed:
sound/soc/soc-generic-dmaengine-pcm.c:185:34: warning: restricted snd_pcm_format_t degrades to integer sound/soc/soc-generic-dmaengine-pcm.c:186:66: warning: incorrect type in argument 1 (different base types)sound/soc/soc-generic-dmaengine-pcm.c:186:66: expected restricted snd_pcm_format_t [usertype] formatsound/soc/soc-generic-dmaengine-pcm.c:186:66: got int [signed] [assigned] i
Fix it by changing the loop variable to be of 'snd_pcm_format_t'.
Also introduce a SNDRV_PCM_FORMAT_FIRST label, which corresponds to the first member (index 0) of the snd_pcm_format_t formats.
--- include/uapi/sound/asound.h | 1 + sound/soc/soc-generic-dmaengine-pcm.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
include/uapi/sound/asound.h +1 -0
@@ -242,6 +242,7 @@ typedef int __bitwise snd_pcm_format_t;#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51)/* DSD, 2-byte samples DSD (x16), big endian */ #define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52)/* DSD, 4-byte samples DSD (x32), big endian */ #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE +#define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8#ifdef SNDRV_LITTLE_ENDIAN #define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
sound/soc/soc-generic-dmaengine-pcm.c +3 -2
@@ -132,7 +132,8 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substreau32 addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ) |BIT (DMA_SLAVE_BUSWIDTH_2_BYTES ) |BIT (DMA_SLAVE_BUSWIDTH_4_BYTES ); -int i, ret; +snd_pcm_format_t i; +int ret;if (pcm->config && pcm->config->pcm_hardware) return snd_soc_set_runtime_hwparams(substream,
@@ -182,7 +183,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea* default assumption is that it supports 1, 2 and 4 bytes * widths. */ -for (i =0 ; i <=SNDRV_PCM_FORMAT_LAST ; i++) { +for (i =SNDRV_PCM_FORMAT_FIRST ; i <=SNDRV_PCM_FORMAT_LAST ; i++) {int bits =snd_pcm_format_physical_width (i);/*
Signature · 1 line
2.16.1
Mark Brown
maintainerApplied "ASoC: soc-generic-dmaengine-pcm: Fix error handling" to the asoc tree
In reply to Fabio EstevamThe patch
ASoC: soc-generic-dmaengine-pcm: Fix error handling
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
f91b1e73ccde71d4bc69ae10d475196df38844abMon Sep 17 00:00:00 2001
From: Fabio Estevam <[email protected]>
Date: Thu, 22 Feb 2018 16:02:21 -0300
Subject: [PATCH] ASoC: soc-generic-dmaengine-pcm: Fix error handling
When dmaengine_pcm_request_chan_of() fails it should release the previously acquired resources, which in this case is to call kfree(pcm), so jump to the correct point in the error path.
--- sound/soc/soc-generic-dmaengine-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-generic-dmaengine-pcm.c +2 -1
@@ -450,7 +450,7 @@ int snd_dmaengine_pcm_register(struct device *dev, ret =dmaengine_pcm_request_chan_of (pcm, dev, config);if (ret) - goto err_free_dma; + goto err_free_pcm; ret =snd_soc_add_component (dev, &pcm->component, &dmaengine_pcm_component,NULL ,0 );
@@ -461,6 +461,7 @@ int snd_dmaengine_pcm_register(struct device *dev, err_free_dma:dmaengine_pcm_release_chan (pcm); +err_free_pcm:kfree (pcm);return ret; }
Signature · 1 line
2.16.1
Lars-Peter Clausen
maintainerQuoted 8 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
When
dmaengine_pcm_request_chan_of()fails it should release the previously acquired resources, which in this case is to call kfree(pcm), so jump to the correct point in the error path.Signed-off-by Fabio Estevam <[email protected]>
This creates a resource leak. dmaengine_pcm_request_chan_of() requests both transmit and receive channels. It might return with an error if one of them fails, but the other one succeeded. In this case we need to call dmaengine_pcm_release_chan() to free the requested channel.
Quoted 26 lines
--- sound/soc/soc-generic-dmaengine-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)sound/soc/soc-generic-dmaengine-pcm.c +2
-1@@ -450,7 +450,7 @@ int snd_dmaengine_pcm_register(struct device *dev, ret =dmaengine_pcm_request_chan_of (pcm, dev, config);if (ret) - goto err_free_dma; + goto err_free_pcm; ret =snd_soc_add_component (dev, &pcm->component, &dmaengine_pcm_component,NULL ,0 );@@ -461,6 +461,7 @@ int snd_dmaengine_pcm_register(struct device *dev, err_free_dma:dmaengine_pcm_release_chan (pcm); +err_free_pcm:kfree (pcm);return ret; }
Quoted 4 lines · Lars-Peter Clausen
This creates a resource leak.
dmaengine_pcm_request_chan_of()requests both transmit and receive channels. It might return with an error if one of them fails, but the other one succeeded. In this case we need to calldmaengine_pcm_release_chan()to free the requested channel.
Ok, I will send a revert.