Commit c0ad3439 authored by Tirui Yin's avatar Tirui Yin
Browse files

ASoC: atmel: Fix error handling in snd_proto_probe 

mainline inclusion
from mainline-v5.18-rc1
commit b0bfaf05
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP3KX
CVE: CVE-2022-49246

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



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

The device_node pointer is returned by of_parse_phandle()  with refcount
incremented. We should use of_node_put() on it when done.

This function only calls of_node_put() in the regular path.
And it will cause refcount leak in error paths.
Fix this by calling of_node_put() in error handling too.

Fixes: a45f8853 ("ASoC: Add driver for PROTO Audio CODEC (with a WM8731)")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Link: https://lore.kernel.org/r/20220308013949.20323-1-linmq006@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Conflicts:
	sound/soc/atmel/mikroe-proto.c
[adapt for OLK-5.10, fix this conflict]
Signed-off-by: default avatarTirui Yin <yintirui@huawei.com>
Reviewed-by: default avataryongqiang Liu <liuyongqiang13@huawei.com>
parent 51146cab

sound/soc/atmel/mikroe-proto.c

+12 −7
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static int snd_proto_probe(struct platform_device *pdev) 
	cpu_np = of_parse_phandle(np, "i2s-controller", 0);

	if (!cpu_np) {

		dev_err(&pdev->dev, "i2s-controller missing\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_codec_node;

	}

	dai->cpus->of_node = cpu_np;

	dai->platforms->of_node = cpu_np;
@@ -124,7 +125,8 @@ static int snd_proto_probe(struct platform_device *pdev) 
					  &bitclkmaster, &framemaster);

	if (bitclkmaster != framemaster) {

		dev_err(&pdev->dev, "Must be the same bitclock and frame master\n");

		return -EINVAL;

		ret = -EINVAL;

		goto put_cpu_node;

	}

	if (bitclkmaster) {

		dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
@@ -133,18 +135,21 @@ static int snd_proto_probe(struct platform_device *pdev) 
		else

			dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

	}

	of_node_put(bitclkmaster);

	of_node_put(framemaster);

	dai->dai_fmt = dai_fmt;



	of_node_put(codec_np);

	of_node_put(cpu_np);



	dai->dai_fmt = dai_fmt;

	ret = snd_soc_register_card(&snd_proto);

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev,

			"snd_soc_register_card() failed: %d\n", ret);





put_cpu_node:

	of_node_put(bitclkmaster);

	of_node_put(framemaster);

	of_node_put(cpu_np);

put_codec_node:

	of_node_put(codec_np);

	return ret;

}