lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 114/175] ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ 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: 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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm_adsp.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
    index 28eb55bc46634..00dd37f10daff 100644
    --- a/sound/soc/codecs/wm_adsp.c
    +++ b/sound/soc/codecs/wm_adsp.c
    @@ -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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:05    [W:4.060 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site