lkml.org 
[lkml]   [2020]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 121/132] staging: greybus: audio: fix uninitialized value issue
    Date
    From: Vaibhav Agarwal <vaibhav.sr@gmail.com>

    commit 1dffeb8b8b4c261c45416d53c75ea51e6ece1770 upstream.

    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: 6339d2322c47 ("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>

    ---
    drivers/staging/greybus/audio_topology.c | 29 +++++++++++++++--------------
    1 file changed, 15 insertions(+), 14 deletions(-)

    --- a/drivers/staging/greybus/audio_topology.c
    +++ b/drivers/staging/greybus/audio_topology.c
    @@ -460,6 +460,15 @@ static int gbcodec_mixer_dapm_ctl_put(st
    val = ucontrol->value.integer.value[0] & mask;
    connect = !!val;

    + ret = gb_pm_runtime_get_sync(bundle);
    + if (ret)
    + return ret;
    +
    + ret = gb_audio_gb_get_control(module->mgmt_connection, data->ctl_id,
    + GB_AUDIO_INVALID_INDEX, &gbvalue);
    + if (ret)
    + goto exit;
    +
    /* update ucontrol */
    if (gbvalue.value.integer_value[0] != val) {
    for (wi = 0; wi < wlist->num_widgets; wi++) {
    @@ -473,25 +482,17 @@ static int gbcodec_mixer_dapm_ctl_put(st
    gbvalue.value.integer_value[0] =
    cpu_to_le32(ucontrol->value.integer.value[0]);

    - ret = gb_pm_runtime_get_sync(bundle);
    - if (ret)
    - return ret;
    -
    ret = gb_audio_gb_set_control(module->mgmt_connection,
    data->ctl_id,
    GB_AUDIO_INVALID_INDEX, &gbvalue);
    -
    - gb_pm_runtime_put_autosuspend(bundle);
    -
    - if (ret) {
    - dev_err_ratelimited(codec->dev,
    - "%d:Error in %s for %s\n", ret,
    - __func__, kcontrol->id.name);
    - return ret;
    - }
    }

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

    #define SOC_DAPM_MIXER_GB(xname, kcount, data) \

    \
     
     \ /
      Last update: 2020-09-16 01:55    [W:4.154 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site