lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 281/879] ASoC: SOF: ipc3-topology: Set scontrol->priv to NULL after freeing it
    Date
    From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

    [ Upstream commit a403993ce98fb401f696da7c4f374739a7609cff ]

    Since the scontrol->priv is freed up during load operation it should be set
    to NULL to be safe against double freeing attempt.

    Fixes: b5cee8feb1d48 ("ASoC: SOF: topology: Make control parsing IPC agnostic")
    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@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/20220331114757.32551-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 af1bbd34213c..cdff48c4195f 100644
    --- a/sound/soc/sof/ipc3-topology.c
    +++ b/sound/soc/sof/ipc3-topology.c
    @@ -1605,6 +1605,7 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_
    if (scontrol->priv_size > 0) {
    memcpy(cdata->data, scontrol->priv, scontrol->priv_size);
    kfree(scontrol->priv);
    + scontrol->priv = NULL;

    if (cdata->data->magic != SOF_ABI_MAGIC) {
    dev_err(sdev->dev, "Wrong ABI magic 0x%08x.\n", cdata->data->magic);
    --
    2.35.1


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