diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2020-12-09 09:54:09 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-12-11 13:21:35 +0000 |
| commit | 85a7555575a0e48f9b73db310d0d762a08a46d63 (patch) | |
| tree | 7f29aa1ff3e7b51a8058cd570fb785c6e769b245 /sound | |
| parent | ASoC: AMD Renoir - add DMI table to avoid the ACP mic probe (broken BIOS) (diff) | |
| download | linux-dev-85a7555575a0e48f9b73db310d0d762a08a46d63.tar.xz linux-dev-85a7555575a0e48f9b73db310d0d762a08a46d63.zip | |
ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control()
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: 2323736dca72 ("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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index e61d00486c65..dec8716aa8ef 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1519,7 +1519,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; @@ -1529,7 +1529,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_subname: kfree(ctl->subname); |