iwlwifi: mvm: Correctly set IGTK for AP

[ Upstream commit e829b17caf96c2da34620e335fb777592990906c ]

Currently when an IGTK is set for an AP, it is set as a regular key.
Since the cipher is set to CMAC, the STA_KEY_FLG_EXT flag is added to
the host command, which causes assert 0x253D on NICs that do not support
this.

Fixes: 85aeb58cec1a ("iwlwifi: mvm: Enable security on new TX API")
Signed-off-by: Beni Lev <beni.lev@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index b026611c6b760ebfc1f224e3684c898f6fc32f5a..9cf8a938ab6e52a0abc38874d9a8c3cf06690241 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -3182,17 +3182,9 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
                }
                sta_id = mvm_sta->sta_id;
 
-               if (keyconf->cipher == WLAN_CIPHER_SUITE_AES_CMAC ||
-                   keyconf->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 ||
-                   keyconf->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256) {
-                       ret = iwl_mvm_send_sta_igtk(mvm, keyconf, sta_id,
-                                                   false);
-                       goto end;
-               }
-
                /*
                 * It is possible that the 'sta' parameter is NULL, and thus
-                * there is a need to retrieve  the sta from the local station
+                * there is a need to retrieve the sta from the local station
                 * table.
                 */
                if (!sta) {
@@ -3207,6 +3199,17 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm,
 
                if (WARN_ON_ONCE(iwl_mvm_sta_from_mac80211(sta)->vif != vif))
                        return -EINVAL;
+       } else {
+               struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+
+               sta_id = mvmvif->mcast_sta.sta_id;
+       }
+
+       if (keyconf->cipher == WLAN_CIPHER_SUITE_AES_CMAC ||
+           keyconf->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 ||
+           keyconf->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256) {
+               ret = iwl_mvm_send_sta_igtk(mvm, keyconf, sta_id, false);
+               goto end;
        }
 
        /* If the key_offset is not pre-assigned, we need to find a