summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-12-17 13:55:49 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-12-17 14:00:17 +0100
commit28a9bc68124c319b2b3dc861e80828a8865fd1ba (patch)
tree442256aed3ae236fd4cdcdaa63a8ade6805c49af /net/mac80211
parent185076d6db7b0320fd7669732923179f9a4d068b (diff)
downloadop-kernel-dev-28a9bc68124c319b2b3dc861e80828a8865fd1ba.zip
op-kernel-dev-28a9bc68124c319b2b3dc861e80828a8865fd1ba.tar.gz
mac80211: free management frame keys when removing station
When writing the code to allow per-station GTKs, I neglected to take into account the management frame keys (index 4 and 5) when freeing the station and only added code to free the first four data frame keys. Fix this by iterating the array of keys over the right length. Cc: stable@vger.kernel.org Fixes: e31b82136d1a ("cfg80211/mac80211: allow per-station GTKs") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 434a91a..0bb7038 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -656,7 +656,7 @@ void ieee80211_free_sta_keys(struct ieee80211_local *local,
int i;
mutex_lock(&local->key_mtx);
- for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+ for (i = 0; i < ARRAY_SIZE(sta->gtk); i++) {
key = key_mtx_dereference(local, sta->gtk[i]);
if (!key)
continue;
OpenPOWER on IntegriCloud