Commit 724808ad authored by Wen Yang's avatar Wen Yang Committed by Mark Brown

ASoC: simple-card: fix an use-after-free in simple_dai_link_of_dpcm()

The node variable is still being used after the of_node_put() call,
which may result in use-after-free.

Fixes: cfc652a7 ("ASoC: simple-card: tidyup prefix for snd_soc_codec_conf")
Link: https://lore.kernel.org/r/1562743509-30496-2-git-send-email-wen.yang99@zte.com.cnSigned-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 794fcee8
...@@ -124,8 +124,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -124,8 +124,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
li->link++; li->link++;
of_node_put(node);
/* For single DAI link & old style of DT node */ /* For single DAI link & old style of DT node */
if (is_top) if (is_top)
prefix = PREFIX; prefix = PREFIX;
...@@ -147,17 +145,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -147,17 +145,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links); ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links);
if (ret) if (ret)
return ret; goto out_put_node;
ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai); ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
ret = asoc_simple_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"fe.%s", "fe.%s",
cpus->dai_name); cpus->dai_name);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
asoc_simple_canonicalize_cpu(dai_link, is_single_links); asoc_simple_canonicalize_cpu(dai_link, is_single_links);
} else { } else {
...@@ -180,17 +178,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -180,17 +178,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
ret = asoc_simple_parse_codec(np, dai_link); ret = asoc_simple_parse_codec(np, dai_link);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai); ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
ret = asoc_simple_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"be.%s", "be.%s",
codecs->dai_name); codecs->dai_name);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
/* check "prefix" from top node */ /* check "prefix" from top node */
snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node, snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
...@@ -208,19 +206,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -208,19 +206,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
ret = asoc_simple_parse_tdm(np, dai); ret = asoc_simple_parse_tdm(np, dai);
if (ret) if (ret)
return ret; goto out_put_node;
ret = asoc_simple_parse_daifmt(dev, node, codec, ret = asoc_simple_parse_daifmt(dev, node, codec,
prefix, &dai_link->dai_fmt); prefix, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return ret; goto out_put_node;
dai_link->dpcm_playback = 1; dai_link->dpcm_playback = 1;
dai_link->dpcm_capture = 1; dai_link->dpcm_capture = 1;
dai_link->ops = &simple_ops; dai_link->ops = &simple_ops;
dai_link->init = asoc_simple_dai_init; dai_link->init = asoc_simple_dai_init;
return 0; out_put_node:
of_node_put(node);
return ret;
} }
static int simple_dai_link_of(struct asoc_simple_priv *priv, static int simple_dai_link_of(struct asoc_simple_priv *priv,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment