Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / key.c

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index d86be6466724a80d008de0eb90d123142a54c01e..67059b88fea5f28619c97ad2ca8c150840045055 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -248,11 +248,11 @@ void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
 }
 
 
-static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
-                                   struct sta_info *sta,
-                                   bool pairwise,
-                                   struct ieee80211_key *old,
-                                   struct ieee80211_key *new)
+static void ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
+                                 struct sta_info *sta,
+                                 bool pairwise,
+                                 struct ieee80211_key *old,
+                                 struct ieee80211_key *new)
 {
        int idx;
        bool defunikey, defmultikey, defmgmtkey;
@@ -409,15 +409,6 @@ static void ieee80211_key_free_common(struct ieee80211_key *key)
 static void __ieee80211_key_destroy(struct ieee80211_key *key,
                                    bool delay_tailroom)
 {
-       if (!key)
-               return;
-
-       /*
-        * Synchronize so the TX path can no longer be using
-        * this key before we free/remove it.
-        */
-       synchronize_net();
-
        if (key->local)
                ieee80211_key_disable_hw_accel(key);
 
@@ -439,6 +430,21 @@ static void __ieee80211_key_destroy(struct ieee80211_key *key,
        ieee80211_key_free_common(key);
 }
 
+static void ieee80211_key_destroy(struct ieee80211_key *key,
+                                 bool delay_tailroom)
+{
+       if (!key)
+               return;
+
+       /*
+        * Synchronize so the TX path can no longer be using
+        * this key before we free/remove it.
+        */
+       synchronize_net();
+
+       __ieee80211_key_destroy(key, delay_tailroom);
+}
+
 void ieee80211_key_free_unused(struct ieee80211_key *key)
 {
        WARN_ON(key->sdata || key->local);
@@ -473,22 +479,22 @@ int ieee80211_key_link(struct ieee80211_key *key,
 
        increment_tailroom_need_count(sdata);
 
-       __ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
-       __ieee80211_key_destroy(old_key, true);
+       ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
+       ieee80211_key_destroy(old_key, true);
 
        ieee80211_debugfs_key_add(key);
 
        ret = ieee80211_key_enable_hw_accel(key);
 
        if (ret)
-               __ieee80211_key_free(key, true);
+               ieee80211_key_free(key, true);
 
        mutex_unlock(&sdata->local->key_mtx);
 
        return ret;
 }
 
-void __ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
+void ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
 {
        if (!key)
                return;
@@ -497,10 +503,10 @@ void __ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
         * Replace key with nothingness if it was ever used.
         */
        if (key->sdata)
-               __ieee80211_key_replace(key->sdata, key->sta,
+               ieee80211_key_replace(key->sdata, key->sta,
                                key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
                                key, NULL);
-       __ieee80211_key_destroy(key, delay_tailroom);
+       ieee80211_key_destroy(key, delay_tailroom);
 }
 
 void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
@@ -560,6 +566,7 @@ EXPORT_SYMBOL(ieee80211_iter_keys);
 void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_key *key, *tmp;
+       LIST_HEAD(keys);
 
        cancel_delayed_work_sync(&sdata->dec_tailroom_needed_wk);
 
@@ -571,17 +578,65 @@ void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
 
        ieee80211_debugfs_key_remove_mgmt_default(sdata);
 
-       list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
-               __ieee80211_key_free(key, false);
+       list_for_each_entry_safe(key, tmp, &sdata->key_list, list) {
+               ieee80211_key_replace(key->sdata, key->sta,
+                               key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
+                               key, NULL);
+               list_add_tail(&key->list, &keys);
+       }
 
        ieee80211_debugfs_key_update_default(sdata);
 
+       if (!list_empty(&keys)) {
+               synchronize_net();
+               list_for_each_entry_safe(key, tmp, &keys, list)
+                       __ieee80211_key_destroy(key, false);
+       }
+
        WARN_ON_ONCE(sdata->crypto_tx_tailroom_needed_cnt ||
                     sdata->crypto_tx_tailroom_pending_dec);
 
        mutex_unlock(&sdata->local->key_mtx);
 }
 
+void ieee80211_free_sta_keys(struct ieee80211_local *local,
+                            struct sta_info *sta)
+{
+       struct ieee80211_key *key, *tmp;
+       LIST_HEAD(keys);
+       int i;
+
+       mutex_lock(&local->key_mtx);
+       for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+               key = key_mtx_dereference(local, sta->gtk[i]);
+               if (!key)
+                       continue;
+               ieee80211_key_replace(key->sdata, key->sta,
+                               key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
+                               key, NULL);
+               list_add(&key->list, &keys);
+       }
+
+       key = key_mtx_dereference(local, sta->ptk);
+       if (key) {
+               ieee80211_key_replace(key->sdata, key->sta,
+                               key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
+                               key, NULL);
+               list_add(&key->list, &keys);
+       }
+
+       /*
+        * NB: the station code relies on this being
+        * done even if there aren't any keys
+        */
+       synchronize_net();
+
+       list_for_each_entry_safe(key, tmp, &keys, list)
+               __ieee80211_key_destroy(key, true);
+
+       mutex_unlock(&local->key_mtx);
+}
+
 void ieee80211_delayed_tailroom_dec(struct work_struct *wk)
 {
        struct ieee80211_sub_if_data *sdata;