| From 5529b5b010d89dccfee71e8f85d9703bf50b9d3c Mon Sep 17 00:00:00 2001 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Mon, 14 Oct 2019 12:02:01 +0100 |
| Subject: [PATCH] staging: wlan-ng: fix exit return when sme->key_idx >= |
| NUM_WEPKEYS |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c |
| index 8a862f718d5c..3c651102900d 100644 |
| --- a/drivers/staging/wlan-ng/cfg80211.c |
| +++ b/drivers/staging/wlan-ng/cfg80211.c |
| @@ -477,10 +477,8 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, |
| /* 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, |
| -- |
| 2.7.4 |
| |
