From: Jerome Brunet <jbrunet@baylibre.com>
To: Colin King <colin.king@canonical.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Kevin Hilman <khilman@baylibre.com>,
alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: meson: fix memory leak of links if allocation of ldata fails
Date: Sun, 07 Jun 2020 22:39:47 +0200 [thread overview]
Message-ID: <1j7dwik3u4.fsf@starbuckisacylon.baylibre.com> (raw)
In-Reply-To: <20200604171216.60043-1-colin.king@canonical.com>
On Thu 04 Jun 2020 at 19:12, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently if the allocation of ldata fails the error return path
> does not kfree the allocated links object. Fix this by adding
> an error exit return path that performs the necessary kfree'ing.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: 7864a79f37b5 ("ASoC: meson: add axg sound card support")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Looks good, Thx
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> sound/soc/meson/meson-card-utils.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c
> index 2ca8c98e204f..5a4a91c88734 100644
> --- a/sound/soc/meson/meson-card-utils.c
> +++ b/sound/soc/meson/meson-card-utils.c
> @@ -49,19 +49,26 @@ int meson_card_reallocate_links(struct snd_soc_card *card,
> links = krealloc(priv->card.dai_link,
> num_links * sizeof(*priv->card.dai_link),
> GFP_KERNEL | __GFP_ZERO);
> + if (!links)
> + goto err_links;
> +
> ldata = krealloc(priv->link_data,
> num_links * sizeof(*priv->link_data),
> GFP_KERNEL | __GFP_ZERO);
> -
> - if (!links || !ldata) {
> - dev_err(priv->card.dev, "failed to allocate links\n");
> - return -ENOMEM;
> - }
> + if (!ldata)
> + goto err_ldata;
>
> priv->card.dai_link = links;
> priv->link_data = ldata;
> priv->card.num_links = num_links;
> return 0;
> +
> +err_ldata:
> + kfree(links);
> +err_links:
> + dev_err(priv->card.dev, "failed to allocate links\n");
> + return -ENOMEM;
> +
> }
> EXPORT_SYMBOL_GPL(meson_card_reallocate_links);
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2020-06-07 20:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-04 17:12 [PATCH] ASoC: meson: fix memory leak of links if allocation of ldata fails Colin King
2020-06-07 20:39 ` Jerome Brunet [this message]
2020-06-08 12:46 ` Mark Brown
2020-07-07 18:51 ` patchwork-bot+linux-amlogic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1j7dwik3u4.fsf@starbuckisacylon.baylibre.com \
--to=jbrunet@baylibre.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).