Unverified Commit aa2e362c authored by Wen Yang's avatar Wen Yang Committed by Mark Brown
Browse files

ASoC: audio-graph-card: fix use-after-free in graph_dai_link_of_dpcm() 

After calling of_node_put() on the ports, port, and node variables,
they are still being used, which may result in use-after-free.
Fix this issue by calling of_node_put() after the last usage.

Fixes: dd98fbc5 ("ASoC: audio-graph-card: cleanup DAI link loop method - step1")
Link: https://lore.kernel.org/r/1562743509-30496-4-git-send-email-wen.yang99@zte.com.cn


Signed-off-by: default avatarWen Yang <wen.yang99@zte.com.cn>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 27862d5a

sound/soc/generic/audio-graph-card.c

+13 −13
Original line number Diff line number Diff line
@@ -208,10 +208,6 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


	dev_dbg(dev, "link_of DPCM (%pOF)\n", ep);



	of_node_put(ports);

	of_node_put(port);

	of_node_put(node);



	if (li->cpu) {

		int is_single_links = 0;
@@ -229,17 +225,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


		ret = asoc_simple_parse_cpu(ep, dai_link, &is_single_links);

		if (ret)

			return ret;

			goto out_put_node;



		ret = asoc_simple_parse_clk_cpu(dev, ep, dai_link, dai);

		if (ret < 0)

			return ret;

			goto out_put_node;



		ret = asoc_simple_set_dailink_name(dev, dai_link,

						   "fe.%s",

						   cpus->dai_name);

		if (ret < 0)

			return ret;

			goto out_put_node;



		/* card->num_links includes Codec */

		asoc_simple_canonicalize_cpu(dai_link, is_single_links);
@@ -263,17 +259,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


		ret = asoc_simple_parse_codec(ep, dai_link);

		if (ret < 0)

			return ret;

			goto out_put_node;



		ret = asoc_simple_parse_clk_codec(dev, ep, dai_link, dai);

		if (ret < 0)

			return ret;

			goto out_put_node;



		ret = asoc_simple_set_dailink_name(dev, dai_link,

						   "be.%s",

						   codecs->dai_name);

		if (ret < 0)

			return ret;

			goto out_put_node;



		/* check "prefix" from top node */

		snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
@@ -293,19 +289,23 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


	ret = asoc_simple_parse_tdm(ep, dai);

	if (ret)

		return ret;

		goto out_put_node;



	ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,

				       NULL, &dai_link->dai_fmt);

	if (ret < 0)

		return ret;

		goto out_put_node;



	dai_link->dpcm_playback		= 1;

	dai_link->dpcm_capture		= 1;

	dai_link->ops			= &graph_ops;

	dai_link->init			= asoc_simple_dai_init;



	return 0;

out_put_node:

	of_node_put(ports);

	of_node_put(port);

	of_node_put(node);

	return ret;

}



static int graph_dai_link_of(struct asoc_simple_priv *priv,