mac80211: support separate default keys
[linux-2.6.git] / net / mac80211 / key.c
index df0c04c..84cf919 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2005-2006, Devicescape Software, Inc.
  * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
- * Copyright 2007      Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2007-2008 Johannes Berg <johannes@sipsolutions.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
 #include <linux/list.h>
 #include <linux/rcupdate.h>
 #include <linux/rtnetlink.h>
+#include <linux/slab.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
+#include "driver-ops.h"
 #include "debugfs_key.h"
 #include "aes_ccm.h"
+#include "aes_cmac.h"
 
 
-/*
- * Key handling basics
+/**
+ * DOC: Key handling basics
  *
  * Key handling in mac80211 is done based on per-interface (sub_if_data)
  * keys and per-station keys. Since each station belongs to an interface,
  * There is currently no way of knowing this except by looking into
  * debugfs.
  *
- * All operations here are called under RTNL so no extra locking is
- * required.
+ * All key operations are protected internally.
  *
- * NOTE: This code requires that sta info *destruction* is done under
- *      RTNL, otherwise it can try to access already freed STA structs
- *      when a STA key is being freed.
+ * Within mac80211, key references are, just as STA structure references,
+ * protected by RCU. Note, however, that some things are unprotected,
+ * namely the key->sta dereferences within the hardware acceleration
+ * functions. This means that sta_info_destroy() must remove the key
+ * which waits for an RCU grace period.
  */
 
 static const u8 bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-static const u8 zero_addr[ETH_ALEN];
 
-static const u8 *get_mac_for_key(struct ieee80211_key *key)
+static void assert_key_lock(struct ieee80211_local *local)
 {
-       const u8 *addr = bcast_addr;
-
-       /*
-        * If we're an AP we won't ever receive frames with a non-WEP
-        * group key so we tell the driver that by using the zero MAC
-        * address to indicate a transmit-only key.
-        */
-       if (key->conf.alg != ALG_WEP &&
-           (key->sdata->vif.type == IEEE80211_IF_TYPE_AP ||
-            key->sdata->vif.type == IEEE80211_IF_TYPE_VLAN))
-               addr = zero_addr;
+       lockdep_assert_held(&local->key_mtx);
+}
 
+static struct ieee80211_sta *get_sta_for_key(struct ieee80211_key *key)
+{
        if (key->sta)
-               addr = key->sta->addr;
+               return &key->sta->sta;
 
-       return addr;
+       return NULL;
 }
 
-static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
+static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 {
-       const u8 *addr;
+       struct ieee80211_sub_if_data *sdata;
+       struct ieee80211_sta *sta;
        int ret;
-       DECLARE_MAC_BUF(mac);
+
+       might_sleep();
 
        if (!key->local->ops->set_key)
-               return;
+               goto out_unsupported;
 
-       addr = get_mac_for_key(key);
+       assert_key_lock(key->local);
 
-       ret = key->local->ops->set_key(local_to_hw(key->local), SET_KEY,
-                                      key->sdata->dev->dev_addr, addr,
-                                      &key->conf);
+       sta = get_sta_for_key(key);
 
-       if (!ret)
-               key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
+       /*
+        * If this is a per-STA GTK, check if it
+        * is supported; if not, return.
+        */
+       if (sta && !(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE) &&
+           !(key->local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK))
+               goto out_unsupported;
 
-       if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)
-               printk(KERN_ERR "mac80211-%s: failed to set key "
-                      "(%d, %s) to hardware (%d)\n",
-                      wiphy_name(key->local->hw.wiphy),
-                      key->conf.keyidx, print_mac(mac, addr), ret);
-}
+       sdata = key->sdata;
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+               /*
+                * The driver doesn't know anything about VLAN interfaces.
+                * Hence, don't send GTKs for VLAN interfaces to the driver.
+                */
+               if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
+                       goto out_unsupported;
+               sdata = container_of(sdata->bss,
+                                    struct ieee80211_sub_if_data,
+                                    u.ap);
+       }
 
-static void ieee80211_key_mark_hw_accel_off(struct ieee80211_key *key)
-{
-       if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
-               key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
-               key->flags |= KEY_FLAG_REMOVE_FROM_HARDWARE;
+       ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
+
+       if (!ret) {
+               key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
+               return 0;
+       }
+
+       if (ret != -ENOSPC && ret != -EOPNOTSUPP)
+               wiphy_err(key->local->hw.wiphy,
+                         "failed to set key (%d, %pM) to hardware (%d)\n",
+                         key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+
+ out_unsupported:
+       switch (key->conf.cipher) {
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
+       case WLAN_CIPHER_SUITE_TKIP:
+       case WLAN_CIPHER_SUITE_CCMP:
+       case WLAN_CIPHER_SUITE_AES_CMAC:
+               /* all of these we can do in software */
+               return 0;
+       default:
+               return -EINVAL;
        }
 }
 
 static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 {
-       const u8 *addr;
+       struct ieee80211_sub_if_data *sdata;
+       struct ieee80211_sta *sta;
        int ret;
-       DECLARE_MAC_BUF(mac);
+
+       might_sleep();
 
        if (!key || !key->local->ops->set_key)
                return;
 
-       if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) &&
-           !(key->flags & KEY_FLAG_REMOVE_FROM_HARDWARE))
+       assert_key_lock(key->local);
+
+       if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
                return;
 
-       addr = get_mac_for_key(key);
+       sta = get_sta_for_key(key);
+       sdata = key->sdata;
 
-       ret = key->local->ops->set_key(local_to_hw(key->local), DISABLE_KEY,
-                                      key->sdata->dev->dev_addr, addr,
-                                      &key->conf);
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+               sdata = container_of(sdata->bss,
+                                    struct ieee80211_sub_if_data,
+                                    u.ap);
+
+       ret = drv_set_key(key->local, DISABLE_KEY, sdata,
+                         sta, &key->conf);
 
        if (ret)
-               printk(KERN_ERR "mac80211-%s: failed to remove key "
-                      "(%d, %s) from hardware (%d)\n",
-                      wiphy_name(key->local->hw.wiphy),
-                      key->conf.keyidx, print_mac(mac, addr), ret);
+               wiphy_err(key->local->hw.wiphy,
+                         "failed to remove key (%d, %pM) from hardware (%d)\n",
+                         key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
 
-       key->flags &= ~(KEY_FLAG_UPLOADED_TO_HARDWARE |
-                       KEY_FLAG_REMOVE_FROM_HARDWARE);
+       key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
 }
 
-struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
-                                         int idx,
-                                         size_t key_len,
-                                         const u8 *key_data)
+void ieee80211_key_removed(struct ieee80211_key_conf *key_conf)
 {
        struct ieee80211_key *key;
 
-       BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS);
+       key = container_of(key_conf, struct ieee80211_key, conf);
 
-       key = kzalloc(sizeof(struct ieee80211_key) + key_len, GFP_KERNEL);
-       if (!key)
-               return NULL;
+       might_sleep();
+       assert_key_lock(key->local);
+
+       key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
 
        /*
-        * Default to software encryption; we'll later upload the
-        * key to the hardware if possible.
+        * Flush TX path to avoid attempts to use this key
+        * after this function returns. Until then, drivers
+        * must be prepared to handle the key.
         */
-       key->conf.flags = 0;
-       key->flags = 0;
+       synchronize_rcu();
+}
+EXPORT_SYMBOL_GPL(ieee80211_key_removed);
 
-       key->conf.alg = alg;
-       key->conf.keyidx = idx;
-       key->conf.keylen = key_len;
-       memcpy(key->conf.key, key_data, key_len);
-       INIT_LIST_HEAD(&key->list);
+static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
+                                       int idx, bool uni, bool multi)
+{
+       struct ieee80211_key *key = NULL;
 
-       if (alg == ALG_CCMP) {
-               /*
-                * Initialize AES key state here as an optimization so that
-                * it does not need to be initialized for every packet.
-                */
-               key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(key_data);
-               if (!key->u.ccmp.tfm) {
-                       ieee80211_key_free(key);
-                       return NULL;
-               }
-       }
+       assert_key_lock(sdata->local);
 
-       return key;
+       if (idx >= 0 && idx < NUM_DEFAULT_KEYS)
+               key = sdata->keys[idx];
+
+       if (uni)
+               rcu_assign_pointer(sdata->default_unicast_key, key);
+       if (multi)
+               rcu_assign_pointer(sdata->default_multicast_key, key);
+
+       ieee80211_debugfs_key_update_default(sdata);
+}
+
+void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx,
+                              bool uni, bool multi)
+{
+       mutex_lock(&sdata->local->key_mtx);
+       __ieee80211_set_default_key(sdata, idx, uni, multi);
+       mutex_unlock(&sdata->local->key_mtx);
+}
+
+static void
+__ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata, int idx)
+{
+       struct ieee80211_key *key = NULL;
+
+       assert_key_lock(sdata->local);
+
+       if (idx >= NUM_DEFAULT_KEYS &&
+           idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS)
+               key = sdata->keys[idx];
+
+       rcu_assign_pointer(sdata->default_mgmt_key, key);
+
+       ieee80211_debugfs_key_update_default(sdata);
+}
+
+void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
+                                   int idx)
+{
+       mutex_lock(&sdata->local->key_mtx);
+       __ieee80211_set_default_mgmt_key(sdata, idx);
+       mutex_unlock(&sdata->local->key_mtx);
 }
 
+
 static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
                                    struct sta_info *sta,
-                                   struct ieee80211_key *key,
+                                   bool pairwise,
+                                   struct ieee80211_key *old,
                                    struct ieee80211_key *new)
 {
-       int idx, defkey;
+       int idx;
+       bool defunikey, defmultikey, defmgmtkey;
 
-       if (sta) {
-               rcu_assign_pointer(sta->key, new);
+       if (new)
+               list_add(&new->list, &sdata->key_list);
+
+       if (sta && pairwise) {
+               rcu_assign_pointer(sta->ptk, new);
+       } else if (sta) {
+               if (old)
+                       idx = old->conf.keyidx;
+               else
+                       idx = new->conf.keyidx;
+               rcu_assign_pointer(sta->gtk[idx], new);
        } else {
-               WARN_ON(new && key && new->conf.keyidx != key->conf.keyidx);
+               WARN_ON(new && old && new->conf.keyidx != old->conf.keyidx);
 
-               if (key)
-                       idx = key->conf.keyidx;
+               if (old)
+                       idx = old->conf.keyidx;
                else
                        idx = new->conf.keyidx;
 
-               defkey = key && sdata->default_key == key;
+               defunikey = old && sdata->default_unicast_key == old;
+               defmultikey = old && sdata->default_multicast_key == old;
+               defmgmtkey = old && sdata->default_mgmt_key == old;
 
-               if (defkey && !new)
-                       ieee80211_set_default_key(sdata, -1);
+               if (defunikey && !new)
+                       __ieee80211_set_default_key(sdata, -1, true, false);
+               if (defmultikey && !new)
+                       __ieee80211_set_default_key(sdata, -1, false, true);
+               if (defmgmtkey && !new)
+                       __ieee80211_set_default_mgmt_key(sdata, -1);
 
                rcu_assign_pointer(sdata->keys[idx], new);
-               if (new)
-                       list_add(&new->list, &sdata->key_list);
-
-               if (defkey && new)
-                       ieee80211_set_default_key(sdata, new->conf.keyidx);
+               if (defunikey && new)
+                       __ieee80211_set_default_key(sdata, new->conf.keyidx,
+                                                   true, false);
+               if (defmultikey && new)
+                       __ieee80211_set_default_key(sdata, new->conf.keyidx,
+                                                   false, true);
+               if (defmgmtkey && new)
+                       __ieee80211_set_default_mgmt_key(sdata,
+                                                        new->conf.keyidx);
        }
 
-       if (key) {
-               ieee80211_key_mark_hw_accel_off(key);
+       if (old) {
                /*
                 * We'll use an empty list to indicate that the key
                 * has already been removed.
                 */
-               list_del_init(&key->list);
+               list_del_init(&old->list);
        }
 }
 
-void ieee80211_key_link(struct ieee80211_key *key,
-                       struct ieee80211_sub_if_data *sdata,
-                       struct sta_info *sta)
+struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,
+                                         const u8 *key_data,
+                                         size_t seq_len, const u8 *seq)
 {
-       struct ieee80211_key *old_key;
-       int idx;
+       struct ieee80211_key *key;
+       int i, j, err;
 
-       ASSERT_RTNL();
-       might_sleep();
+       BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS);
+
+       key = kzalloc(sizeof(struct ieee80211_key) + key_len, GFP_KERNEL);
+       if (!key)
+               return ERR_PTR(-ENOMEM);
+
+       /*
+        * Default to software encryption; we'll later upload the
+        * key to the hardware if possible.
+        */
+       key->conf.flags = 0;
+       key->flags = 0;
+
+       key->conf.cipher = cipher;
+       key->conf.keyidx = idx;
+       key->conf.keylen = key_len;
+       switch (cipher) {
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
+               key->conf.iv_len = WEP_IV_LEN;
+               key->conf.icv_len = WEP_ICV_LEN;
+               break;
+       case WLAN_CIPHER_SUITE_TKIP:
+               key->conf.iv_len = TKIP_IV_LEN;
+               key->conf.icv_len = TKIP_ICV_LEN;
+               if (seq) {
+                       for (i = 0; i < NUM_RX_DATA_QUEUES; i++) {
+                               key->u.tkip.rx[i].iv32 =
+                                       get_unaligned_le32(&seq[2]);
+                               key->u.tkip.rx[i].iv16 =
+                                       get_unaligned_le16(seq);
+                       }
+               }
+               break;
+       case WLAN_CIPHER_SUITE_CCMP:
+               key->conf.iv_len = CCMP_HDR_LEN;
+               key->conf.icv_len = CCMP_MIC_LEN;
+               if (seq) {
+                       for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++)
+                               for (j = 0; j < CCMP_PN_LEN; j++)
+                                       key->u.ccmp.rx_pn[i][j] =
+                                               seq[CCMP_PN_LEN - j - 1];
+               }
+               /*
+                * Initialize AES key state here as an optimization so that
+                * it does not need to be initialized for every packet.
+                */
+               key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(key_data);
+               if (IS_ERR(key->u.ccmp.tfm)) {
+                       err = PTR_ERR(key->u.ccmp.tfm);
+                       kfree(key);
+                       key = ERR_PTR(err);
+               }
+               break;
+       case WLAN_CIPHER_SUITE_AES_CMAC:
+               key->conf.iv_len = 0;
+               key->conf.icv_len = sizeof(struct ieee80211_mmie);
+               if (seq)
+                       for (j = 0; j < 6; j++)
+                               key->u.aes_cmac.rx_pn[j] = seq[6 - j - 1];
+               /*
+                * Initialize AES key state here as an optimization so that
+                * it does not need to be initialized for every packet.
+                */
+               key->u.aes_cmac.tfm =
+                       ieee80211_aes_cmac_key_setup(key_data);
+               if (IS_ERR(key->u.aes_cmac.tfm)) {
+                       err = PTR_ERR(key->u.aes_cmac.tfm);
+                       kfree(key);
+                       key = ERR_PTR(err);
+               }
+               break;
+       }
+       memcpy(key->conf.key, key_data, key_len);
+       INIT_LIST_HEAD(&key->list);
+
+       return key;
+}
+
+static void __ieee80211_key_destroy(struct ieee80211_key *key)
+{
+       if (!key)
+               return;
+
+       if (key->local)
+               ieee80211_key_disable_hw_accel(key);
+
+       if (key->conf.cipher == WLAN_CIPHER_SUITE_CCMP)
+               ieee80211_aes_key_free(key->u.ccmp.tfm);
+       if (key->conf.cipher == WLAN_CIPHER_SUITE_AES_CMAC)
+               ieee80211_aes_cmac_key_free(key->u.aes_cmac.tfm);
+       if (key->local)
+               ieee80211_debugfs_key_remove(key);
+
+       kfree(key);
+}
+
+int ieee80211_key_link(struct ieee80211_key *key,
+                      struct ieee80211_sub_if_data *sdata,
+                      struct sta_info *sta)
+{
+       struct ieee80211_key *old_key;
+       int idx, ret;
+       bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
 
        BUG_ON(!sdata);
        BUG_ON(!key);
@@ -225,121 +408,74 @@ void ieee80211_key_link(struct ieee80211_key *key,
        key->sdata = sdata;
        key->sta = sta;
 
-       ieee80211_debugfs_key_add(key->local, key);
-
        if (sta) {
-               ieee80211_debugfs_key_sta_link(key, sta);
-
                /*
                 * some hardware cannot handle TKIP with QoS, so
                 * we indicate whether QoS could be in use.
                 */
-               if (sta->flags & WLAN_STA_WME)
+               if (test_sta_flags(sta, WLAN_STA_WME))
                        key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
        } else {
-               if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
+               if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                        struct sta_info *ap;
 
-                       rcu_read_lock();
+                       /*
+                        * We're getting a sta pointer in,
+                        * so must be under RCU read lock.
+                        */
 
                        /* same here, the AP could be using QoS */
-                       ap = sta_info_get(key->local, key->sdata->u.sta.bssid);
+                       ap = sta_info_get(key->sdata, key->sdata->u.mgd.bssid);
                        if (ap) {
-                               if (ap->flags & WLAN_STA_WME)
+                               if (test_sta_flags(ap, WLAN_STA_WME))
                                        key->conf.flags |=
                                                IEEE80211_KEY_FLAG_WMM_STA;
                        }
-
-                       rcu_read_unlock();
                }
        }
 
-       if (sta)
-               old_key = sta->key;
+       mutex_lock(&sdata->local->key_mtx);
+
+       if (sta && pairwise)
+               old_key = sta->ptk;
+       else if (sta)
+               old_key = sta->gtk[idx];
        else
                old_key = sdata->keys[idx];
 
-       __ieee80211_key_replace(sdata, sta, old_key, key);
-
-       if (old_key) {
-               synchronize_rcu();
-               ieee80211_key_free(old_key);
-       }
-
-       if (netif_running(sdata->dev))
-               ieee80211_key_enable_hw_accel(key);
-}
-
-void ieee80211_key_free(struct ieee80211_key *key)
-{
-       ASSERT_RTNL();
-       might_sleep();
-
-       if (!key)
-               return;
-
-       if (key->sdata) {
-               /*
-                * Replace key with nothingness.
-                *
-                * Because other code may have key reference (RCU protected)
-                * right now, we then wait for a grace period before freeing
-                * it.
-                * An empty list indicates it was never added to the key list
-                * or has been removed already. It may, however, still be in
-                * hardware for acceleration.
-                */
-               if (!list_empty(&key->list))
-                       __ieee80211_key_replace(key->sdata, key->sta,
-                                               key, NULL);
+       __ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
+       __ieee80211_key_destroy(old_key);
 
-               /*
-                * Do NOT remove this without looking at sta_info_destroy()
-                */
-               synchronize_rcu();
+       ieee80211_debugfs_key_add(key);
 
-               /*
-                * Remove from hwaccel if appropriate, this will
-                * only happen when the key is actually unlinked,
-                * it will already be done when the key was replaced.
-                */
-               ieee80211_key_disable_hw_accel(key);
-       }
+       ret = ieee80211_key_enable_hw_accel(key);
 
-       if (key->conf.alg == ALG_CCMP)
-               ieee80211_aes_key_free(key->u.ccmp.tfm);
-       ieee80211_debugfs_key_remove(key);
+       mutex_unlock(&sdata->local->key_mtx);
 
-       kfree(key);
+       return ret;
 }
 
-void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx)
+static void __ieee80211_key_free(struct ieee80211_key *key)
 {
-       struct ieee80211_key *key = NULL;
-
-       if (idx >= 0 && idx < NUM_DEFAULT_KEYS)
-               key = sdata->keys[idx];
-
-       if (sdata->default_key != key) {
-               ieee80211_debugfs_key_remove_default(sdata);
-
-               rcu_assign_pointer(sdata->default_key, key);
-
-               if (sdata->default_key)
-                       ieee80211_debugfs_key_add_default(sdata);
-       }
+       /*
+        * Replace key with nothingness if it was ever used.
+        */
+       if (key->sdata)
+               __ieee80211_key_replace(key->sdata, key->sta,
+                               key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
+                               key, NULL);
+       __ieee80211_key_destroy(key);
 }
 
-void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
+void ieee80211_key_free(struct ieee80211_local *local,
+                       struct ieee80211_key *key)
 {
-       struct ieee80211_key *key, *tmp;
-       LIST_HEAD(tmp_list);
-
-       ASSERT_RTNL();
-       might_sleep();
+       if (!key)
+               return;
 
-       list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
-               ieee80211_key_free(key);
+       mutex_lock(&local->key_mtx);
+       __ieee80211_key_free(key);
+       mutex_unlock(&local->key_mtx);
 }
 
 void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
@@ -347,13 +483,16 @@ void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
        struct ieee80211_key *key;
 
        ASSERT_RTNL();
-       might_sleep();
 
-       if (WARN_ON(!netif_running(sdata->dev)))
+       if (WARN_ON(!ieee80211_sdata_running(sdata)))
                return;
 
+       mutex_lock(&sdata->local->key_mtx);
+
        list_for_each_entry(key, &sdata->key_list, list)
                ieee80211_key_enable_hw_accel(key);
+
+       mutex_unlock(&sdata->local->key_mtx);
 }
 
 void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata)
@@ -361,8 +500,27 @@ void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata)
        struct ieee80211_key *key;
 
        ASSERT_RTNL();
-       might_sleep();
+
+       mutex_lock(&sdata->local->key_mtx);
 
        list_for_each_entry(key, &sdata->key_list, list)
                ieee80211_key_disable_hw_accel(key);
+
+       mutex_unlock(&sdata->local->key_mtx);
+}
+
+void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_key *key, *tmp;
+
+       mutex_lock(&sdata->local->key_mtx);
+
+       ieee80211_debugfs_key_remove_mgmt_default(sdata);
+
+       list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
+               __ieee80211_key_free(key);
+
+       ieee80211_debugfs_key_update_default(sdata);
+
+       mutex_unlock(&sdata->local->key_mtx);
 }