lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 101/148] ASoC: intel: Fix memleak in sst_media_open
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 062fa09f44f4fb3776a23184d5d296b0c8872eb9 ]

    When power_up_sst() fails, stream needs to be freed
    just like when try_module_get() fails. However, current
    code is returning directly and ends up leaking memory.

    Fixes: 0121327c1a68b ("ASoC: Intel: mfld-pcm: add control for powering up/down dsp")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20200813084112.26205-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    index 8817eaae6bb7a..b520e3aeaf3de 100644
    --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    @@ -331,7 +331,7 @@ static int sst_media_open(struct snd_pcm_substream *substream,

    ret_val = power_up_sst(stream);
    if (ret_val < 0)
    - return ret_val;
    + goto out_power_up;

    /* Make sure, that the period size is always even */
    snd_pcm_hw_constraint_step(substream->runtime, 0,
    @@ -340,8 +340,9 @@ static int sst_media_open(struct snd_pcm_substream *substream,
    return snd_pcm_hw_constraint_integer(runtime,
    SNDRV_PCM_HW_PARAM_PERIODS);
    out_ops:
    - kfree(stream);
    mutex_unlock(&sst_lock);
    +out_power_up:
    + kfree(stream);
    return ret_val;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-24 11:56    [W:3.742 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site