lkml.org 
[lkml]   [2019]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 108/197] staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS
    Date
    From: Colin Ian King <colin.king@canonical.com>

    commit 153c5d8191c26165dbbd2646448ca7207f7796d0 upstream.

    Currently the exit return path when sme->key_idx >= NUM_WEPKEYS is via
    label 'exit' and this checks if result is non-zero, however result has
    not been initialized and contains garbage. Fix this by replacing the
    goto with a return with the error code.

    Addresses-Coverity: ("Uninitialized scalar variable")
    Fixes: 0ca6d8e74489 ("Staging: wlan-ng: replace switch-case statements with macro")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Cc: stable <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20191014110201.9874-1-colin.king@canonical.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/wlan-ng/cfg80211.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/staging/wlan-ng/cfg80211.c
    +++ b/drivers/staging/wlan-ng/cfg80211.c
    @@ -469,10 +469,8 @@ static int prism2_connect(struct wiphy *
    /* Set the encryption - we only support wep */
    if (is_wep) {
    if (sme->key) {
    - if (sme->key_idx >= NUM_WEPKEYS) {
    - err = -EINVAL;
    - goto exit;
    - }
    + if (sme->key_idx >= NUM_WEPKEYS)
    + return -EINVAL;

    result = prism2_domibset_uint32(wlandev,
    DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,

    \
     
     \ /
      Last update: 2019-10-27 22:29    [W:2.496 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site