Unverified Commit 70b77321 authored Feb 19, 2019 by Takashi Iwai Committed by Mark Brown Feb 20, 2019

ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of()



Although qcom_snd_parse_of() tries to manage the of-node refcount,
there are still a few places that lead to the unblanced refcount in
the error code path.  Namely,

- for_each_child_of_node() needs to unreference the iterator node if
  aborting the loop in the middle,
- cpu, codec and platform node objects have to be unreferenced at each
  iteration,
- platform and codec node objects have to be referred before jumping
  to the error handling code that unreference them unconditionally.

This patch tries to address these by moving the assignment of platform
and codec node objects to the beginning of the loop and adding the
of_node_put() calls adequately.

Fixes: c25e295c ("ASoC: qcom: Add support to parse common audio device nodes")
Cc: Patrick Lai <plai@codeaurora.org>
Cc: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 8d166720

sound/soc/qcom/common.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,9 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
		link = card->dai_link;
		for_each_child_of_node(dev->of_node, np) {
		cpu = of_get_child_by_name(np, "cpu");
		platform = of_get_child_by_name(np, "platform");
		codec = of_get_child_by_name(np, "codec");

		if (!cpu) {
		dev_err(dev, "Can't find cpu DT node\n");
		ret = -EINVAL;
		@@ -63,8 +66,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
		goto err;
		}

		platform = of_get_child_by_name(np, "platform");
		codec = of_get_child_by_name(np, "codec");
		if (codec && platform) {
		link->platform_of_node = of_parse_phandle(platform,
		"sound-dai",
		@@ -100,10 +101,15 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
		link->dpcm_capture = 1;
		link->stream_name = link->name;
		link++;

		of_node_put(cpu);
		of_node_put(codec);
		of_node_put(platform);
		}

		return 0;
		err:
		of_node_put(np);
		of_node_put(cpu);
		of_node_put(codec);
		of_node_put(platform);

Admin message