Commit 0b18732e authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Zeng Heng
Browse files

ASoC: mediatek: Fix missing of_node_put in mt2701_wm8960_machine_probe 

stable inclusion
from stable-v4.19.247
commit 9345122f5fb9f97a206f440f38bb656e53f46912
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP3KL
CVE: CVE-2022-49517

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9345122f5fb9f97a206f440f38bb656e53f46912



--------------------------------

[ Upstream commit 05654431 ]

This node pointer is returned by of_parse_phandle() with
refcount incremented in this function.
Calling of_node_put() to avoid the refcount leak.

Fixes: 8625c1db ("ASoC: mediatek: Add mt2701-wm8960 machine driver")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220404093526.30004-1-linmq006@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 72481518

sound/soc/mediatek/mt2701/mt2701-wm8960.c

+7 −2
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
	if (!codec_node) {

		dev_err(&pdev->dev,

			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_platform_node;

	}

	for (i = 0; i < card->num_links; i++) {

		if (mt2701_wm8960_dai_links[i].codec_name)
@@ -129,7 +130,7 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
	ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

	if (ret) {

		dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret);

		return ret;

		goto put_codec_node;

	}



	ret = devm_snd_soc_register_card(&pdev->dev, card);
@@ -137,6 +138,10 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



put_codec_node:

	of_node_put(codec_node);

put_platform_node:

	of_node_put(platform_node);

	return ret;

}