Skip to content

Commit 1dffeb8

Browse files
agarwalvaibhavgregkh
authored andcommitted
staging: greybus: audio: fix uninitialized value issue
The current implementation for gbcodec_mixer_dapm_ctl_put() uses uninitialized gbvalue for comparison with updated value. This was found using static analysis with coverity. Uninitialized scalar variable (UNINIT) 11. uninit_use: Using uninitialized value gbvalue.value.integer_value[0]. 460 if (gbvalue.value.integer_value[0] != val) { This patch fixes the issue with fetching the gbvalue before using it for comparision. Fixes: 6339d23 ("greybus: audio: Add topology parser for GB codec") Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Vaibhav Agarwal <vaibhav.sr@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/bc4f29eb502ccf93cd2ffd98db0e319fa7d0f247.1597408126.git.vaibhav.sr@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fea22e1 commit 1dffeb8

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

drivers/staging/greybus/audio_topology.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,15 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,
456456
val = ucontrol->value.integer.value[0] & mask;
457457
connect = !!val;
458458

459+
ret = gb_pm_runtime_get_sync(bundle);
460+
if (ret)
461+
return ret;
462+
463+
ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,
464+
GB_AUDIO_INVALID_INDEX, &gbvalue);
465+
if (ret)
466+
goto exit;
467+
459468
/* update ucontrol */
460469
if (gbvalue.value.integer_value[0] != val) {
461470
for (wi = 0; wi < wlist->num_widgets; wi++) {
@@ -466,25 +475,17 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,
466475
gbvalue.value.integer_value[0] =
467476
cpu_to_le32(ucontrol->value.integer.value[0]);
468477

469-
ret = gb_pm_runtime_get_sync(bundle);
470-
if (ret)
471-
return ret;
472-
473478
ret = gb_audio_gb_set_control(module->mgmt_connection,
474479
data->ctl_id,
475480
GB_AUDIO_INVALID_INDEX, &gbvalue);
476-
477-
gb_pm_runtime_put_autosuspend(bundle);
478-
479-
if (ret) {
480-
dev_err_ratelimited(codec_dev,
481-
"%d:Error in %s for %s\n", ret,
482-
__func__, kcontrol->id.name);
483-
return ret;
484-
}
485481
}
486482

487-
return 0;
483+
exit:
484+
gb_pm_runtime_put_autosuspend(bundle);
485+
if (ret)
486+
dev_err_ratelimited(codec_dev, "%d:Error in %s for %s\n", ret,
487+
__func__, kcontrol->id.name);
488+
return ret;
488489
}
489490

490491
#define SOC_DAPM_MIXER_GB(xname, kcount, data) \

0 commit comments

Comments
 (0)