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 0833/1095] ASoC: mediatek: mt8173-rt5650: Fix refcount leak in mt8173_rt5650_dev_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit efe2178d1a32492f99e7f1f2568eea5c88a85729 ]

    of_parse_phandle() returns a node pointer with refcount
    incremented, we should use of_node_put() on it when not need anymore.
    Fix refcount leak in some error paths.

    Fixes: 0f83f9296d5c ("ASoC: mediatek: Add machine driver for ALC5650 codec")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220603124243.31358-1-linmq006@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
    index fc164f4f95f8..487807ee7019 100644
    --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
    +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
    @@ -280,7 +280,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
    if (!mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) {
    dev_err(&pdev->dev,
    "Property 'audio-codec' missing or invalid\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_platform_node;
    }
    mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node =
    mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node;
    @@ -293,7 +294,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
    dev_err(&pdev->dev,
    "%s codec_capture_dai name fail %d\n",
    __func__, ret);
    - return ret;
    + goto put_platform_node;
    }
    mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].dai_name =
    codec_capture_dai;
    @@ -315,12 +316,14 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
    if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codecs->of_node) {
    dev_err(&pdev->dev,
    "Property 'audio-codec' missing or invalid\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_platform_node;
    }
    card->dev = &pdev->dev;

    ret = devm_snd_soc_register_card(&pdev->dev, card);

    +put_platform_node:
    of_node_put(platform_node);
    return ret;
    }
    --
    2.35.1


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