lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0878/1095] ASoC: SOF: ipc3-topology: Prevent double freeing of ipc_control_data via load_bytes
    Date
    From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

    [ Upstream commit d5bd47f3ca124058a8e87eae4508afeda2132611 ]

    We have sanity checks for byte controls and if any of the fail the locally
    allocated scontrol->ipc_control_data is freed up, but not set to NULL.

    On a rollback path of the error the higher level code will also try to free
    the scontrol->ipc_control_data which will eventually going to lead to
    memory corruption as double freeing memory is not a good thing.

    Fixes: b5cee8feb1d4 ("ASoC: SOF: topology: Make control parsing IPC agnostic")
    Reported-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
    Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
    Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20220712130103.31514-1-peter.ujfalusi@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/sof/ipc3-topology.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
    index 80fb82ece38d..74c230fbcf68 100644
    --- a/sound/soc/sof/ipc3-topology.c
    +++ b/sound/soc/sof/ipc3-topology.c
    @@ -1629,6 +1629,7 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_
    return 0;
    err:
    kfree(scontrol->ipc_control_data);
    + scontrol->ipc_control_data = NULL;
    return ret;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:44    [W:4.209 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site