| Message ID | 20210407092027.60769-1-krzysztof.kozlowski@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa74c223b6fd78a5314b4c61b9abdbed3c2185b4 |
| Headers | show |
| Series | ASoC: simple-card: fix possible uninitialized single_cpu local variable | expand |
On 4/7/2021 2:50 PM, Krzysztof Kozlowski wrote: > 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> > --- > sound/soc/generic/audio-graph-card.c | 2 +- > sound/soc/generic/simple-card.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > Acked-by: Sameer Pujar <spujar@nvidia.com>
On Wed, 7 Apr 2021 11:20:27 +0200, Krzysztof Kozlowski wrote: > 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. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: simple-card: fix possible uninitialized single_cpu local variable commit: fa74c223b6fd78a5314b4c61b9abdbed3c2185b4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index ee1d924d68e5..76036ea377a9 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -367,7 +367,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; dev_dbg(dev, "link_of (%pOF)\n", cpu_ep); diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 41aa40765a8d..9a05f44fc3a9 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -249,7 +249,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 = np; node = of_get_parent(np);
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> --- sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/generic/simple-card.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)