linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mac80211: read station mgmt keys via get_key call
@ 2013-12-08 11:31 Max.Stepanov
  2013-12-16 14:10 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Max.Stepanov @ 2013-12-08 11:31 UTC (permalink / raw)
  To: linux-wireless; +Cc: Max Stepanov

From: Max Stepanov <Max.Stepanov@intel.com>

Allow to read management keys stored in a station's gtk key
array with a get_key function.

Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
---
 net/mac80211/cfg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 00fa219..e96960f 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -303,7 +303,8 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
 
 		if (pairwise && key_idx < NUM_DEFAULT_KEYS)
 			key = rcu_dereference(sta->ptk[key_idx]);
-		else if (!pairwise && key_idx < NUM_DEFAULT_KEYS)
+		else if (!pairwise &&
+			 key_idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS)
 			key = rcu_dereference(sta->gtk[key_idx]);
 	} else
 		key = rcu_dereference(sdata->keys[key_idx]);
-- 
1.8.5.rc2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] mac80211: read station mgmt keys via get_key call
  2013-12-08 11:31 [PATCH] mac80211: read station mgmt keys via get_key call Max.Stepanov
@ 2013-12-16 14:10 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2013-12-16 14:10 UTC (permalink / raw)
  To: Max.Stepanov; +Cc: linux-wireless

On Sun, 2013-12-08 at 13:31 +0200, Max.Stepanov@intel.com wrote:
> From: Max Stepanov <Max.Stepanov@intel.com>
> 
> Allow to read management keys stored in a station's gtk key
> array with a get_key function.

Applied.

johannes


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-12-16 14:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-08 11:31 [PATCH] mac80211: read station mgmt keys via get_key call Max.Stepanov
2013-12-16 14:10 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).