wifi: ath12k: ath12k_mac_op_set_key(): fix uninitialized symbol 'ret'
authorKalle Valo <quic_kvalo@quicinc.com>
Tue, 26 Nov 2024 17:11:38 +0000 (19:11 +0200)
committerKalle Valo <quic_kvalo@quicinc.com>
Fri, 29 Nov 2024 11:17:46 +0000 (13:17 +0200)
Dan reported that in some cases the ret variable could be uninitialized. Fix
that by removing the out label entirely and returning zero explicitly on
succesful cases.

Also remove the unnecessary else branches to follow more the style used in
ath12k and now it's easier to see the error handling.

No functional changes.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/7e7afd00-ad84-4744-8d94-416bab7e7dd9@stanley.mountain/
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241126171139.2350704-10-kvalo@kernel.org
drivers/net/wireless/ath/ath12k/mac.c

index ee804d4a3fd8d7e7b2b951e495dc80eacca37e35..ae8a253c466cdab47906393abe3a0a4064bee57e 100644 (file)
@@ -4657,6 +4657,7 @@ static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
        if (sta) {
                ahsta = ath12k_sta_to_ahsta(sta);
+
                /* For an ML STA Pairwise key is same for all associated link Stations,
                 * hence do set key for all link STAs which are active.
                 */
@@ -4679,41 +4680,47 @@ static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                                if (ret)
                                        break;
                        }
-               } else {
-                       arsta = &ahsta->deflink;
-                       arvif = arsta->arvif;
-                       if (WARN_ON(!arvif)) {
-                               ret = -EINVAL;
-                               goto out;
-                       }
 
-                       ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, arsta, key);
-               }
-       } else {
-               if (key->link_id >= 0 && key->link_id < IEEE80211_MLD_MAX_NUM_LINKS) {
-                       link_id = key->link_id;
-                       arvif = wiphy_dereference(hw->wiphy, ahvif->link[link_id]);
-               } else {
-                       link_id = 0;
-                       arvif = &ahvif->deflink;
+                       return 0;
                }
 
-               if (!arvif || !arvif->is_created) {
-                       cache = ath12k_ahvif_get_link_cache(ahvif, link_id);
-                       if (!cache)
-                               return -ENOSPC;
+               arsta = &ahsta->deflink;
+               arvif = arsta->arvif;
+               if (WARN_ON(!arvif))
+                       return -EINVAL;
+
+               ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, arsta, key);
+               if (ret)
+                       return ret;
+
+               return 0;
+       }
+
+       if (key->link_id >= 0 && key->link_id < IEEE80211_MLD_MAX_NUM_LINKS) {
+               link_id = key->link_id;
+               arvif = wiphy_dereference(hw->wiphy, ahvif->link[link_id]);
+       } else {
+               link_id = 0;
+               arvif = &ahvif->deflink;
+       }
 
-                       ret = ath12k_mac_update_key_cache(cache, cmd, sta, key);
+       if (!arvif || !arvif->is_created) {
+               cache = ath12k_ahvif_get_link_cache(ahvif, link_id);
+               if (!cache)
+                       return -ENOSPC;
 
+               ret = ath12k_mac_update_key_cache(cache, cmd, sta, key);
+               if (ret)
                        return ret;
-               }
 
-               ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, NULL, key);
+               return 0;
        }
 
-out:
+       ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, NULL, key);
+       if (ret)
+               return ret;
 
-       return ret;
+       return 0;
 }
 
 static int