[alsa-devel] [PATCH] ASoC: smd845: fix memory leak
In case memory resources for *card* were allocated, release them before return.
Addresses-Coverity-ID: 1472244 ("Resource leak") Fixes: 6b1687bf76ef ("ASoC: qcom: add sdm845 sound card support") Signed-off-by: Gustavo A. R. Silva gustavo@embeddedor.com --- NOTE: Notice that there are many places in which the return values of functions snd_soc_dai_set_sysclk() and snd_soc_dai_set_fmt() are not being checked. I wonder if this is intentional. Otherwise, I can send a patch for that. Please, confirm. Thanks!
sound/soc/qcom/sdm845.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index be0cb11..c1adb77 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -222,8 +222,10 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev)
/* Allocate the private data */ data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; + if (!data) { + ret = -ENOMEM; + goto data_alloc_fail; + }
card->dev = dev; dev_set_drvdata(dev, card); @@ -248,6 +250,7 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) kfree(card->dai_link); parse_dt_fail: kfree(data); +data_alloc_fail: kfree(card); return ret; }
The patch
ASoC: smd845: fix memory leak
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
From 8530ebf1079ccc84ffa32d970cdcae168b2f3684 Mon Sep 17 00:00:00 2001
From: "Gustavo A. R. Silva" gustavo@embeddedor.com Date: Fri, 3 Aug 2018 08:42:11 -0500 Subject: [PATCH] ASoC: smd845: fix memory leak
In case memory resources for *card* were allocated, release them before return.
Addresses-Coverity-ID: 1472244 ("Resource leak") Fixes: 6b1687bf76ef ("ASoC: qcom: add sdm845 sound card support") Signed-off-by: Gustavo A. R. Silva gustavo@embeddedor.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/qcom/sdm845.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index be0cb1122036..c1adb77230eb 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -222,8 +222,10 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev)
/* Allocate the private data */ data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; + if (!data) { + ret = -ENOMEM; + goto data_alloc_fail; + }
card->dev = dev; dev_set_drvdata(dev, card); @@ -248,6 +250,7 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) kfree(card->dai_link); parse_dt_fail: kfree(data); +data_alloc_fail: kfree(card); return ret; }
participants (2)
-
Gustavo A. R. Silva -
Mark Brown