ASoC: atmel: Fix error handling in snd_proto_probe

Commit Message

Miaoqian Lin March 7, 2022, 1:04 p.m. UTC

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: a45f8853a5f9 ("ASoC: Add driver for PROTO Audio CODEC (with a WM8731)")
Signed-off-by: Miaoqian Lin <[e-mail]>
---
 sound/soc/atmel/mikroe-proto.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Comments

Codrin Ciubotariu March 7, 2022, 1:45 p.m. UTC | #1

On 07.03.2022 15:04, Miaoqian Lin wrote:
> @@ -136,18 +138,21 @@ static int snd_proto_probe(struct platform_device *pdev)
>                  dai_fmt |= snd_soc_daifmt_parse_clock_provider_as_flag(np, NULL);
>          }
> 
> -       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;

looks like there is an extra line that remains here

With this addressed, you can add:

Reviewed-by: Codrin Ciubotariu <[e-mail]>

Thanks!

Patch

diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 627564c18c27..9ed634ee9dfc 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -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;
@@ -125,7 +126,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) {
 		if (codec_np == bitclkmaster)
@@ -136,18 +138,21 @@  static int snd_proto_probe(struct platform_device *pdev)
 		dai_fmt |= snd_soc_daifmt_parse_clock_provider_as_flag(np, NULL);
 	}
 
-	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)
 		dev_err_probe(&pdev->dev, ret,
 			"snd_soc_register_card() failed\n");
 
+
+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;
 }