Skip to content

Commit

Permalink
ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_cont…
Browse files Browse the repository at this point in the history
…rol()

[ Upstream commit 85a7555 ]

The error handling frees "ctl" but it's still on the "dsp->ctl_list"
list so that could result in a use after free.  Remove it from the list
before returning.

Fixes: 2323736 ("ASoC: wm_adsp: Add basic support for rev 1 firmware file format")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/X9B0keV/02wrx9Xs@mwanda
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Dan Carpenter authored and gregkh committed Dec 30, 2020
1 parent 297e48c commit aca4d1b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/soc/codecs/wm_adsp.c
Expand Up @@ -1496,7 +1496,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
ctl_work = kzalloc(sizeof(*ctl_work), GFP_KERNEL);
if (!ctl_work) {
ret = -ENOMEM;
goto err_ctl_cache;
goto err_list_del;
}

ctl_work->dsp = dsp;
Expand All @@ -1506,7 +1506,8 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,

return 0;

err_ctl_cache:
err_list_del:
list_del(&ctl->list);
kfree(ctl->cache);
err_ctl_name:
kfree(ctl->name);
Expand Down

0 comments on commit aca4d1b

Please sign in to comment.