ASoC: simple-card: fix possible uninitialized single_cpu local variable

[ Upstream commit fa74c223b6fd78a5314b4c61b9abdbed3c2185b4 ]

The 'single_cpu' local variable is assigned by asoc_simple_parse_dai()
and later used in a asoc_simple_canonicalize_cpu() call, assuming the
entire function did not exit on errors.

However the first function returns 0 if passed device_node is NULL,
thus leaving the variable uninitialized and reporting success.

Addresses-Coverity: Uninitialized scalar variable
Fixes: 8f7f298a3337 ("ASoC: simple-card-utils: separate asoc_simple_card_parse_dai()")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Sameer Pujar <spujar@nvidia.com>
Link: https://lore.kernel.org/r/20210407092027.60769-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 6007e630573540eb62f003f4bebfbb16dcc8b70d..1bc49812468990f15fa18d5ebbe08169d958076a 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -340,7 +340,7 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
        struct device_node *top = dev->of_node;
        struct asoc_simple_dai *cpu_dai;
        struct asoc_simple_dai *codec_dai;
-       int ret, single_cpu;
+       int ret, single_cpu = 0;
 
        /* Do it only CPU turn */
        if (!li->cpu)

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fc9c753db8dd3afef1393e9065dff53c2366fe24..4484c40c7a39c257f11828bb4fb2d393a9e7967b 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -258,7 +258,7 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
        struct device_node *plat = NULL;
        char prop[128];
        char *prefix = "";
-       int ret, single_cpu;
+       int ret, single_cpu = 0;
 
        /*
         *       |CPU   |Codec   : turn