summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorWen Yang <wen.yang99@zte.com.cn>2019-07-10 15:25:07 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-29 08:29:44 +0200
commit86827ec32e56268353fb4bb8f4ef1764e9746159 (patch)
treefd509f0338c4b1b07a4308cf6a6a279cc1bf5d66 /sound
parent9b7f263403ab9d928c5482d1101f2f8077ac0202 (diff)
ASoC: simple-card: fix an use-after-free in simple_for_each_link()
[ Upstream commit 27862d5a3325bc531ec15e3c607e44aa0fd57f6f ] The codec variable is still being used after the of_node_put() call, which may result in use-after-free. Fixes: d947cdfd4be2 ("ASoC: simple-card: cleanup DAI link loop method - step1") Link: https://lore.kernel.org/r/1562743509-30496-3-git-send-email-wen.yang99@zte.com.cn Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 544064fdc780..2712a2b20102 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -378,8 +378,6 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
goto error;
}
- of_node_put(codec);
-
/* get convert-xxx property */
memset(&adata, 0, sizeof(adata));
for_each_child_of_node(node, np)
@@ -401,11 +399,13 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
ret = func_noml(priv, np, codec, li, is_top);
if (ret < 0) {
+ of_node_put(codec);
of_node_put(np);
goto error;
}
}
+ of_node_put(codec);
node = of_get_next_child(top, node);
} while (!is_top && node);