]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: meson: axg-card: fix null pointer dereference in clean up
authorJerome Brunet <jbrunet@baylibre.com>
Mon, 10 Jun 2019 12:53:44 +0000 (14:53 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 10 Jun 2019 14:39:26 +0000 (15:39 +0100)
When using modern dai_link style, we must first make sure the
struct snd_soc_dai_link_component exists before accessing its members.

In case of early probe deferral, some of the '.cpus' or '.codecs' may not
have been allocated yet. Check this before calling of_node_put() on the
structure member.

Fixes: c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style")
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/meson/axg-card.c

index fb03258d00aef6a25a118f25a6b7b822d7bc5707..70bb0cbad2332f98e54e48e6e34c6e2f0efdbb95 100644 (file)
@@ -115,9 +115,11 @@ static void axg_card_clean_references(struct axg_card *priv)
 
        if (card->dai_link) {
                for_each_card_prelinks(card, i, link) {
-                       of_node_put(link->cpus->of_node);
+                       if (link->cpus)
+                               of_node_put(link->cpus->of_node);
                        for_each_link_codecs(link, j, codec)
-                               of_node_put(codec->of_node);
+                               if (codec)
+                                       of_node_put(codec->of_node);
                }
        }