Unverified Commit 3be46f29 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15487 CVE-2022-49514 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/QDAAV4QNIHK5A2RANUKOQ3HOZD2CQCMO/ 
Miaoqian Lin (1):
  ASoC: mediatek: Fix error handling in mt8173_max98090_dev_probe

Tzung-Bi Shih (1):
  ASoC: mediatek: mt8173: fix device_node leak

 
https://gitee.com/src-openeuler/kernel/issues/IBP6WS 
 
Link:https://gitee.com/openeuler/kernel/pulls/15487

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 71b6f5af c7dd0110

sound/soc/mediatek/mt8173/mt8173-max98090.c

+7 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static int mt8173_max98090_dev_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 (mt8173_max98090_dais[i].codec_name)
@@ -169,6 +170,11 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) 
	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



	of_node_put(codec_node);



put_platform_node:

	of_node_put(platform_node);

	return ret;

}

sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) 
	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



	of_node_put(platform_node);

	return ret;

}

sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) 
	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



	of_node_put(platform_node);

	return ret;

}

sound/soc/mediatek/mt8173/mt8173-rt5650.c

+2 −0
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) 
	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);



	of_node_put(platform_node);

	return ret;

}