AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control()

Browse Source 
[ Upstream commit 85a7555575a0e48f9b73db310d0d762a08a46d63 ]

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: 2323736dca ("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>
This commit is contained in:
Dan Carpenter 2020-12-09 09:54:09 +03:00 committed by Greg Kroah-Hartman
parent 7fcf1c1380
commit ebfeeb104f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/wm_adsp.c
View File

@ -1519,7 +1519,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
ctl_work = kzalloc(sizeof(*ctl_work), GFP_KERNEL); ctl_work = kzalloc(sizeof(*ctl_work), GFP_KERNEL);
if (!ctl_work) { if (!ctl_work) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_ctl_cache; goto err_list_del;
} }
ctl_work->dsp = dsp; ctl_work->dsp = dsp;
@ -1529,7 +1529,8 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
return 0; return 0;
err_ctl_cache: err_list_del:
list_del(&ctl->list);
kfree(ctl->cache); kfree(ctl->cache);
err_ctl_subname: err_ctl_subname:
kfree(ctl->subname); kfree(ctl->subname);