lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 596/700] ASoC: max98373-sdw: add missing memory allocation check
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit 468a272ca49cc4e2f58f3c360643c3f6d313c146 ]

    We forgot to test that devm_kcalloc doesn't return NULL.

    Fixes: 349dd23931d1 ('ASoC: max98373: don't access volatile registers in bias level off')
    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
    Reviewed-by: Bard Liao <bard.liao@intel.com>
    Link: https://lore.kernel.org/r/20210607222239.582139-2-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/max98373-sdw.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
    index f3a12205cd48..c7a3506046db 100644
    --- a/sound/soc/codecs/max98373-sdw.c
    +++ b/sound/soc/codecs/max98373-sdw.c
    @@ -787,6 +787,8 @@ static int max98373_init(struct sdw_slave *slave, struct regmap *regmap)
    max98373->cache = devm_kcalloc(dev, max98373->cache_num,
    sizeof(*max98373->cache),
    GFP_KERNEL);
    + if (!max98373->cache)
    + return -ENOMEM;

    for (i = 0; i < max98373->cache_num; i++)
    max98373->cache[i].reg = max98373_sdw_cache_reg[i];
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:3.568 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site