diff options
| author | Colin Ian King <colin.king@canonical.com> | 2020-06-04 19:12:16 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-05 13:13:03 +0200 |
| commit | 6e801dc411329aff592fbd48fb116183d0acdb00 (patch) | |
| tree | 1fd9b044f7b74e3d08f82ed8d946dcabe4eb8282 /sound/soc/meson | |
| parent | ASoC: max98390: Fix potential crash during param fw loading (diff) | |
| download | linux-6e801dc411329aff592fbd48fb116183d0acdb00.tar.xz linux-6e801dc411329aff592fbd48fb116183d0acdb00.zip | |
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: 7864a79f37b5 ("ASoC: meson: add axg sound card support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Resource leak")
Link: https://lore.kernel.org/r/20200604171216.60043-1-colin.king@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/meson')
| -rw-r--r-- | sound/soc/meson/meson-card-utils.c | 17 |
1 files 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); |