Commit 6e801dc4 authored by Colin Ian King's avatar Colin Ian King Committed by Mark Brown

ASoC: meson: fix memory leak of links if allocation of ldata fails

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.

Fixes: 7864a79f ("ASoC: meson: add axg sound card support")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Resource leak")
Link: https://lore.kernel.org/r/20200604171216.60043-1-colin.king@canonical.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97ed3e50
...@@ -49,19 +49,26 @@ int meson_card_reallocate_links(struct snd_soc_card *card, ...@@ -49,19 +49,26 @@ int meson_card_reallocate_links(struct snd_soc_card *card,
links = krealloc(priv->card.dai_link, links = krealloc(priv->card.dai_link,
num_links * sizeof(*priv->card.dai_link), num_links * sizeof(*priv->card.dai_link),
GFP_KERNEL | __GFP_ZERO); GFP_KERNEL | __GFP_ZERO);
if (!links)
goto err_links;
ldata = krealloc(priv->link_data, ldata = krealloc(priv->link_data,
num_links * sizeof(*priv->link_data), num_links * sizeof(*priv->link_data),
GFP_KERNEL | __GFP_ZERO); GFP_KERNEL | __GFP_ZERO);
if (!ldata)
if (!links || !ldata) { goto err_ldata;
dev_err(priv->card.dev, "failed to allocate links\n");
return -ENOMEM;
}
priv->card.dai_link = links; priv->card.dai_link = links;
priv->link_data = ldata; priv->link_data = ldata;
priv->card.num_links = num_links; priv->card.num_links = num_links;
return 0; 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); EXPORT_SYMBOL_GPL(meson_card_reallocate_links);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment