lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 203/389] ASoC: mediatek: mt8173: Fix refcount leak in mt8173_rt5650_rt5676_dev_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit ae4f11c1ed2d67192fdf3d89db719ee439827c11 ]

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

    Fixes: 94319ba10eca ("ASoC: mediatek: Use platform_of_node for machine drivers")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220602034144.60159-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-rt5676.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
    index 727ff0f7f20b..8e1e60a9b45c 100644
    --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
    +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
    @@ -256,14 +256,16 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
    if (!mt8173_rt5650_rt5676_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_node;
    }
    mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node =
    of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1);
    if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node) {
    dev_err(&pdev->dev,
    "Property 'audio-codec' missing or invalid\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_node;
    }
    mt8173_rt5650_rt5676_codec_conf[0].of_node =
    mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node;
    @@ -276,7 +278,8 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
    if (!mt8173_rt5650_rt5676_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_node;
    }

    card->dev = &pdev->dev;
    @@ -286,6 +289,7 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
    dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
    __func__, ret);

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


    \
     
     \ /
      Last update: 2022-08-23 13:42    [W:4.044 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site