Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fb3c45 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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



[ 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: 2323736d ("ASoC: wm_adsp: Add basic support for rev 1 firmware file format")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/X9B0keV/02wrx9Xs@mwanda


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 43661d9a

sound/soc/codecs/wm_adsp.c

+3 −2
Original line number Diff line number Diff line
@@ -1156,7 +1156,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;
@@ -1166,7 +1166,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);