Skip to contentSkip to conversation

iwlwifi: don't install GTKs for IBSS vifs on resume

PATCH In review Antonio Quartulli 3 participants 4 messages Nov 30, 2013 – Dec 1, 2013 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwlwifi: don't install GTKs for IBSS vifs on resume

From: Antonio Quartulli <[email protected]>

When performing keys reprogramming on HW resume, GTKs belonging to IBSS stations should be skipped and not installed onto the device.

Such keys are not installed by set_key() and the same behaviour has to be kept on reprogramming (mac80211 is already performing enc/dec in SW for those keys).

---

* compiled tested only *

 drivers/net/wireless/iwlwifi/dvm/lib.c | 5 +++++
 drivers/net/wireless/iwlwifi/mvm/d3.c  | 5 +++++
 2 files changed, 10 insertions(+)
drivers/net/wireless/iwlwifi/dvm/lib.c +5 -0
index 3d5bdc4..96be24d 100644
@@ -929,6 +929,11 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
 	u16 p1k[IWLAGN_P1K_SIZE];
 	int ret, i;
 
+	/* Group keys for IBSS interfaces are not stored in HW */
+	if (vif->type == NL80211_IFTYPE_ADHOC &&
+	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+		return;
+
 	mutex_lock(&priv->mutex);
 
 	if ((key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
drivers/net/wireless/iwlwifi/mvm/d3.c +5 -0
index 6f45966..53182e6 100644
@@ -156,6 +156,11 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,
 	u16 p1k[IWL_P1K_SIZE];
 	int ret, i;
 
+	/* Group keys for IBSS interfaces are not stored in HW */
+	if (vif->type == NL80211_IFTYPE_ADHOC &&
+	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+		return;
+
 	mutex_lock(&mvm->mutex);
 
 	switch (key->cipher) {
Signature · 1 line
1.8.4.4
#1 lore raw
Quoted 39 lines

When performing keys reprogramming on HW resume, GTKs belonging to IBSS stations should be skipped and not installed onto the device.

Such keys are not installed by set_key() and the same behaviour has to be kept on reprogramming (mac80211 is already performing enc/dec in SW for those keys).

---

* compiled tested only *

 drivers/net/wireless/iwlwifi/dvm/lib.c | 5 +++++
 drivers/net/wireless/iwlwifi/mvm/d3.c  | 5 +++++
 2 files changed, 10 insertions(+)
drivers/net/wireless/iwlwifi/dvm/lib.c +5 -0
index 3d5bdc4..96be24d 100644
@@ -929,6 +929,11 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
        u16 p1k[IWLAGN_P1K_SIZE];
        int ret, i;
 
+       /* Group keys for IBSS interfaces are not stored in HW */
+       if (vif->type == NL80211_IFTYPE_ADHOC &&
+           !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+               return;
+
        mutex_lock(&priv->mutex);
 
        if ((key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
drivers/net/wireless/iwlwifi/mvm/d3.c +0 -0
index 6f45966..53182e6 100644

drivers/net/wireless/iwlwifi/mvm/d3.c static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, · line 164

Quoted 9 lines
drivers/net/wireless/iwlwifi/mvm/d3.c +5 -0
@@ -156,6 +156,11 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,
        u16 p1k[IWL_P1K_SIZE];
        int ret, i;
 
+       /* Group keys for IBSS interfaces are not stored in HW */
+       if (vif->type == NL80211_IFTYPE_ADHOC &&
+           !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+               return;
+
        mutex_lock(&mvm->mutex);

This is WoWLAN code - so you I must miss something here...
We don't support IBSS in WoWLAN (thinking about it even makes me feel bad).

#2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 4 lines · Emmanuel Grumbach
Quoted 4 lines

+ /* Group keys for IBSS interfaces are not stored in HW
*/ + if (vif->type == NL80211_IFTYPE_ADHOC && +
!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) +
return; +

Well, my knowledge about WoWLAN is really poor (in particular for what concern IWLWIFI). I think I should have sent this as RFC first.

So isn't it possible to reach this point with a key that satisfies that condition? If so, we are fine :)

Cheers,

- --
Antonio Quartulli
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iEYEARECAAYFAlKbA9kACgkQpGgxIkP9cwdLPgCfbzHDFGPl73p/a+d0Tf2nEt3t iPwAmwTxQLYqb9fji3Ld58vgXdsl/Yrw
=sgjH
-----END PGP SIGNATURE-----

#3 lore raw
Quoted 6 lines · Antonio Quartulli
Quoted 4 lines · Emmanuel Grumbach
Quoted 4 lines

+ /* Group keys for IBSS interfaces are not stored in HW
*/ + if (vif->type == NL80211_IFTYPE_ADHOC && +
!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) +
return; +

Quoted 6 lines

Well, my knowledge about WoWLAN is really poor (in particular for what concern IWLWIFI). I think I should have sent this as RFC first.

So isn't it possible to reach this point with a key that satisfies that condition? If so, we are fine :)

No - because in WoWLAN we will never have IBSS configured. WoWLAN supports (currently) BSS only - I am not even sure we want to have P2P Client there.