cfg80211/mac80211: allow per-station GTKs
Johannes Berg
maintainerPATCH 1/1 cfg80211/mac80211: allow per-station GTKs
From: Johannes Berg <[email protected]>
This adds API to allow adding per-station GTKs, updates mac80211 to support it, and also allows drivers to remove a key from hwaccel again when this may be necessary due to multiple GTKs.
---
Never really got feedback on this, but I think it's ok...
drivers/net/wireless/iwmc3200wifi/cfg80211.c | 7 + drivers/net/wireless/libertas/cfg.c | 4 - drivers/net/wireless/rndis_wlan.c | 12 +-- include/linux/nl80211.h | 12 +++ include/net/cfg80211.h | 9 +- include/net/mac80211.h | 24 ++++++ net/mac80211/cfg.c | 32 ++++++--- net/mac80211/ieee80211_i.h | 2 net/mac80211/key.c | 95 +++++++++++++++++---------- net/mac80211/key.h | 3 net/mac80211/rx.c | 43 +++++++----- net/mac80211/sta_info.c | 10 +- net/mac80211/sta_info.h | 6 + net/mac80211/tx.c | 2 net/wireless/core.h | 2 net/wireless/ibss.c | 2 net/wireless/nl80211.c | 87 ++++++++++++++++++++++-- net/wireless/sme.c | 2 net/wireless/util.c | 12 ++- net/wireless/wext-compat.c | 38 +++++++--- 20 files changed, 294 insertions(+), 110 deletions(-)
include/net/mac80211.h +24 -0
@@ -1041,6 +1041,13 @@ enum ieee80211_tkip_key_type {* @IEEE80211_HW_NEED_DTIM_PERIOD: * This device needs to know the DTIM period for the BSS before * associating. +* +* @IEEE80211_HW_SUPPORTS_PER_STA_GTK: The device's crypto engine supports +* per-station GTKs as used by IBSS RSN or during fast transition. If +* the device doesn't support per-station GTKs, but can be asked not +* to decrypt group addressed frames, then IBSS RSN support is still +* possible but software crypto will be used. Advertise the wiphy flag +* only in that case. */ enum ieee80211_hw_flags {IEEE80211_HW_HAS_RATE_CONTROL =1 <<0 ,
@@ -1064,6 +1071,7 @@ enum ieee80211_hw_flags {IEEE80211_HW_REPORTS_TX_ACK_STATUS =1 <<18 ,IEEE80211_HW_CONNECTION_MONITOR =1 <<19 ,IEEE80211_HW_SUPPORTS_CQM_RSSI =1 <<20 , + IEEE80211_HW_SUPPORTS_PER_STA_GTK = 1<<21, };/**
@@ -2578,6 +2586,22 @@ void ieee80211_chswitch_done(struct ieeevoid ieee80211_request_smps (struct ieee80211_vif *vif,enum ieee80211_smps_mode smps_mode); +/** +* ieee80211_key_removed - disable hw acceleration for key +* @key_conf: The key hw acceleration should be disabled for +* +* This allows drivers to indicate that the given key has been +* removed from hardware acceleration, due to a new key that +* was added. Don't use this if the key can continue to be used +* for TX, if the key restriction is on RX only it is permitted +* to keep the key for TX only and not call this function. +* +* Due to locking constraints, it may only be called during +* @set_key. This function must be allowed to sleep, and the +* key it tries to disable may still be used until it returns. +*/ +void ieee80211_key_removed (struct ieee80211_key_conf *key_conf); +/* Rate control API */ /**
include/net/cfg80211.h +6 -3
@@ -1128,13 +1128,14 @@ struct cfg80211_ops { struct vif_params *params);int (*add_key)(struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr, +u8 key_index,bool pairwise,const u8 *mac_addr,struct key_params *params);int (*get_key)(struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr,void *cookie, +u8 key_index,bool pairwise,const u8 *mac_addr, +void *cookie,void (*callback)(void *cookie,struct key_params *));int (*del_key)(struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr); +u8 key_index,bool pairwise,const u8 *mac_addr);int (*set_default_key)(struct wiphy *wiphy,struct net_device *netdev,u8 key_index);
@@ -1302,6 +1303,7 @@ struct cfg80211_ops {* @WIPHY_FLAG_CONTROL_PORT_PROTOCOL: This device supports setting the * control port protocol ethertype. The device also honours the * control_port_no_encrypt flag. +* @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN. */ enum wiphy_flags {WIPHY_FLAG_CUSTOM_REGULATORY =BIT (0 ),
@@ -1312,6 +1314,7 @@ enum wiphy_flags {WIPHY_FLAG_4ADDR_AP =BIT (5 ),WIPHY_FLAG_4ADDR_STATION =BIT (6 ),WIPHY_FLAG_CONTROL_PORT_PROTOCOL =BIT (7 ), + WIPHY_FLAG_IBSS_RSN = BIT(7), }; struct mac_address {
net/mac80211/key.c +61 -34
165 lines not on this page · raw message
drivers/net/wireless/iwmc3200wifi/cfg80211.c +4 -3
@@ -161,7 +161,7 @@ static int iwm_key_init(struct iwm_key * }static int iwm_cfg80211_add_key (struct wiphy *wiphy,struct net_device *ndev, -u8 key_index,const u8 *mac_addr, +u8 key_index,bool pairwise,const u8 *mac_addr,struct key_params *params) {struct iwm_priv *iwm =ndev_to_iwm (ndev);
@@ -181,7 +181,8 @@ static int iwm_cfg80211_add_key(struct w }static int iwm_cfg80211_get_key (struct wiphy *wiphy,struct net_device *ndev, -u8 key_index,const u8 *mac_addr,void *cookie, +u8 key_index,bool pairwise,const u8 *mac_addr, +void *cookie,void (*callback)(void *cookie,struct key_params *)) {
@@ -206,7 +207,7 @@ static int iwm_cfg80211_get_key(struct wstatic int iwm_cfg80211_del_key (struct wiphy *wiphy,struct net_device *ndev, -u8 key_index,const u8 *mac_addr) +u8 key_index,bool pairwise,const u8 *mac_addr) {struct iwm_priv *iwm =ndev_to_iwm (ndev);struct iwm_key *key = &iwm->keys[key_index];
drivers/net/wireless/libertas/cfg.c +2 -2
@@ -1440,7 +1440,7 @@ static int lbs_cfg_set_default_key(strucstatic int lbs_cfg_add_key (struct wiphy *wiphy,struct net_device *netdev, -u8 idx,const u8 *mac_addr, +u8 idx,bool pairwise,const u8 *mac_addr,struct key_params *params) {struct lbs_private *priv =wiphy_priv (wiphy);
@@ -1500,7 +1500,7 @@ static int lbs_cfg_add_key(struct wiphystatic int lbs_cfg_del_key (struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr) +u8 key_index,bool pairwise,const u8 *mac_addr) {lbs_deb_enter (LBS_DEB_CFG80211 );
drivers/net/wireless/rndis_wlan.c +6 -6
@@ -540,11 +540,11 @@ static int rndis_set_channel(struct wiph struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);static int rndis_add_key (struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr, -struct key_params *params); +u8 key_index,bool pairwise,const u8 *mac_addr, +struct key_params *params);static int rndis_del_key (struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr); +u8 key_index,bool pairwise,const u8 *mac_addr);static int rndis_set_default_key (struct wiphy *wiphy,struct net_device *netdev,u8 key_index);
@@ -2308,8 +2308,8 @@ static int rndis_set_channel(struct wiph }static int rndis_add_key (struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr, -struct key_params *params) +u8 key_index,bool pairwise,const u8 *mac_addr, +struct key_params *params) {struct rndis_wlan_private *priv =wiphy_priv (wiphy);struct usbnet *usbdev = priv->usbdev;
@@ -2344,7 +2344,7 @@ static int rndis_add_key(struct wiphy *w }static int rndis_del_key (struct wiphy *wiphy,struct net_device *netdev, -u8 key_index,const u8 *mac_addr) +u8 key_index,bool pairwise,const u8 *mac_addr) {struct rndis_wlan_private *priv =wiphy_priv (wiphy);struct usbnet *usbdev = priv->usbdev;
net/mac80211/cfg.c +23 -9
@@ -75,7 +75,7 @@ static int ieee80211_change_iface(struct }static int ieee80211_add_key (struct wiphy *wiphy,struct net_device *dev, -u8 key_idx,const u8 *mac_addr, +u8 key_idx,bool pairwise,const u8 *mac_addr,struct key_params *params) {struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);
@@ -103,6 +103,9 @@ static int ieee80211_add_key(struct wiphif (IS_ERR (key))return PTR_ERR (key); +if (pairwise) + key->conf.flags |=IEEE80211_KEY_FLAG_PAIRWISE ; +mutex_lock (&sdata->local->sta_mtx);if (mac_addr) {
@@ -125,7 +128,7 @@ static int ieee80211_add_key(struct wiph }static int ieee80211_del_key (struct wiphy *wiphy,struct net_device *dev, -u8 key_idx,const u8 *mac_addr) +u8 key_idx,bool pairwise,const u8 *mac_addr) {struct ieee80211_sub_if_data *sdata;struct sta_info *sta;
@@ -142,10 +145,17 @@ static int ieee80211_del_key(struct wiphif (!sta) goto out_unlock; -if (sta->key) { -ieee80211_key_free (sdata->local, sta->key); -WARN_ON (sta->key); - ret =0 ; +if (pairwise) { +if (sta->ptk) { +ieee80211_key_free (sdata->local, sta->ptk); + ret =0 ; + } + }else { +if (sta->gtk[key_idx]) { +ieee80211_key_free (sdata->local, + sta->gtk[key_idx]); + ret =0 ; + } } goto out_unlock;
@@ -167,7 +177,8 @@ static int ieee80211_del_key(struct wiph }static int ieee80211_get_key (struct wiphy *wiphy,struct net_device *dev, -u8 key_idx,const u8 *mac_addr,void *cookie, +u8 key_idx,bool pairwise,const u8 *mac_addr, +void *cookie,void (*callback)(void *cookie,struct key_params *params)) {
@@ -175,7 +186,7 @@ static int ieee80211_get_key(struct wiphstruct sta_info *sta =NULL ;u8 seq[6 ] = {0 };struct key_params params; -struct ieee80211_key *key; +struct ieee80211_key *key =NULL ;u32 iv32;u16 iv16;int err = -ENOENT ;
@@ -189,7 +200,10 @@ static int ieee80211_get_key(struct wiphif (!sta) goto out; - key = sta->key; +if (pairwise) + key = sta->ptk; +else if (key_idx <NUM_DEFAULT_KEYS ) + key = sta->gtk[key_idx]; }else key = sdata->keys[key_idx];
net/mac80211/sta_info.h +4 -2
@@ -199,7 +199,8 @@ enum plink_state {* @hnext: hash table linked list pointer * @local: pointer to the global information * @sdata: virtual interface this station belongs to -* @key: peer key negotiated with this station, if any +* @ptk: peer key negotiated with this station, if any +* @gtk: group keys negotiated with this station, if any * @rate_ctrl: rate control algorithm reference * @rate_ctrl_priv: rate control private per-STA pointer * @last_tx_rate: rate used for last transmit, to report to userspace as
@@ -254,7 +255,8 @@ struct sta_info {struct sta_info *hnext;struct ieee80211_local *local;struct ieee80211_sub_if_data *sdata; -struct ieee80211_key *key; +struct ieee80211_key *gtk[NUM_DEFAULT_KEYS +NUM_DEFAULT_MGMT_KEYS ]; +struct ieee80211_key *ptk;struct rate_control_ref *rate_ctrl;void *rate_ctrl_priv;spinlock_t lock;
net/mac80211/sta_info.c +5 -5
@@ -616,7 +616,7 @@ static int __must_check __sta_info_destrstruct ieee80211_sub_if_data *sdata;struct sk_buff *skb;unsigned long flags; -int ret; +int ret, i;might_sleep ();
@@ -644,10 +644,10 @@ static int __must_check __sta_info_destrif (ret)return ret; -if (sta->key) { -ieee80211_key_free (local, sta->key); -WARN_ON (sta->key); - } +for (i =0 ; i <NUM_DEFAULT_KEYS ; i++) +ieee80211_key_free (local, sta->gtk[i]); +if (sta->ptk) +ieee80211_key_free (local, sta->ptk); sta->dead = true;
net/mac80211/rx.c +27 -16
73 lines not on this page · raw message
net/mac80211/tx.c +1 -1
@@ -529,7 +529,7 @@ ieee80211_tx_h_select_key(struct ieee802if (unlikely (info->flags &IEEE80211_TX_INTFL_DONT_ENCRYPT )) tx->key =NULL ; -else if (tx->sta && (key =rcu_dereference (tx->sta->key))) +else if (tx->sta && (key =rcu_dereference (tx->sta->ptk))) tx->key = key; else if (ieee80211_is_mgmt(hdr->frame_control) && is_multicast_ether_addr(hdr->addr1) &&
net/wireless/ibss.c +1 -1
@@ -160,7 +160,7 @@ static void __cfg80211_clear_ibss(struct*/ if (rdev->ops->del_key)for (i =0 ; i <6 ; i++) - rdev->ops->del_key (wdev->wiphy, dev, i,NULL ); + rdev->ops->del_key (wdev->wiphy, dev, i, false,NULL );if (wdev->current_bss) {cfg80211_unhold_bss (wdev->current_bss);
net/wireless/nl80211.c +79 -8
198 lines not on this page · raw message
net/wireless/sme.c +1 -1
@@ -698,7 +698,7 @@ void __cfg80211_disconnected(struct net_*/ if (rdev->ops->del_key)for (i =0 ; i <6 ; i++) - rdev->ops->del_key (wdev->wiphy, dev, i,NULL ); + rdev->ops->del_key (wdev->wiphy, dev, i, false,NULL );#ifdef CONFIG_CFG80211_WEXT memset (&wrqu,0 ,sizeof (wrqu));
net/wireless/util.c +9 -3
@@ -144,19 +144,25 @@ void ieee80211_set_bitrate_flags(structint cfg80211_validate_key_settings (struct cfg80211_registered_device *rdev,struct key_params *params,int key_idx, -const u8 *mac_addr) +bool pairwise,const u8 *mac_addr) {int i;if (key_idx >5 )return -EINVAL ; +if (!pairwise && mac_addr && !(rdev->wiphy.flags &WIPHY_FLAG_IBSS_RSN )) +return -EINVAL ; + +if (pairwise && !mac_addr) +return -EINVAL ; +/* * Disallow pairwise keys with non-zero index unless it's WEP * (because current deployments use pairwise WEP keys with * non-zero indizes but 802.11i clearly specifies to use zero) */ -if (mac_addr && key_idx && +if (pairwise && key_idx && params->cipher !=WLAN_CIPHER_SUITE_WEP40 && params->cipher !=WLAN_CIPHER_SUITE_WEP104 )return -EINVAL ;
@@ -677,7 +683,7 @@ void cfg80211_upload_connect_keys(structfor (i =0 ; i <6 ; i++) {if (!wdev->connect_keys->params[i].cipher)continue ; -if (rdev->ops->add_key (wdev->wiphy, dev, i,NULL , +if (rdev->ops->add_key (wdev->wiphy, dev, i, false,NULL , &wdev->connect_keys->params[i])) {printk (KERN_ERR "%s: failed to set key %d\n" , dev->name, i);
net/wireless/core.h +1 -1
@@ -375,7 +375,7 @@ bool cfg80211_sme_failed_reassoc(struct/* internal helpers */ int cfg80211_validate_key_settings (struct cfg80211_registered_device *rdev,struct key_params *params,int key_idx, -const u8 *mac_addr); +bool pairwise,const u8 *mac_addr);void __cfg80211_disconnected (struct net_device *dev,const u8 *ie,size_t ie_len,u16 reason,bool from_ap);void cfg80211_sme_scan_done (struct net_device *dev);
net/wireless/wext-compat.c +25 -13
@@ -432,14 +432,17 @@ int cfg80211_wext_giwretry(struct net_deEXPORT_SYMBOL_GPL (cfg80211_wext_giwretry);static int __cfg80211_set_encryption (struct cfg80211_registered_device *rdev, -struct net_device *dev,const u8 *addr, -bool remove,bool tx_key,int idx, -struct key_params *params) +struct net_device *dev,bool pairwise, +const u8 *addr,bool remove,bool tx_key, +int idx,struct key_params *params) {struct wireless_dev *wdev = dev->ieee80211_ptr;int err, i;bool rejoin = false; +if (pairwise && !addr) +return -EINVAL ; +if (!wdev->wext.keys) { wdev->wext.keys =kzalloc (sizeof (*wdev->wext.keys),GFP_KERNEL );
@@ -478,7 +481,13 @@ static int __cfg80211_set_encryption(str__cfg80211_leave_ibss (rdev, wdev->netdev, true); rejoin = true; } - err = rdev->ops->del_key (&rdev->wiphy, dev, idx, addr); + +if (!pairwise && addr && + !(rdev->wiphy.flags &WIPHY_FLAG_IBSS_RSN )) + err = -ENOENT ; +else + err = rdev->ops->del_key (&rdev->wiphy, dev, idx, + pairwise, addr); } wdev->wext.connect.privacy = false;/*
@@ -507,12 +516,13 @@ static int __cfg80211_set_encryption(strif (addr) tx_key = false; -if (cfg80211_validate_key_settings (rdev, params, idx, addr)) +if (cfg80211_validate_key_settings (rdev, params, idx, pairwise, addr))return -EINVAL ; err =0 ;if (wdev->current_bss) - err = rdev->ops->add_key (&rdev->wiphy, dev, idx, addr, params); + err = rdev->ops->add_key (&rdev->wiphy, dev, idx, + pairwise, addr, params);if (err)return err;
@@ -563,17 +573,17 @@ static int __cfg80211_set_encryption(str }static int cfg80211_set_encryption (struct cfg80211_registered_device *rdev, -struct net_device *dev,const u8 *addr, -bool remove,bool tx_key,int idx, -struct key_params *params) +struct net_device *dev,bool pairwise, +const u8 *addr,bool remove,bool tx_key, +int idx,struct key_params *params) {int err;/* devlist mutex needed for possible IBSS re-join */ mutex_lock (&rdev->devlist_mtx);wdev_lock (dev->ieee80211_ptr); - err =__cfg80211_set_encryption (rdev, dev, addr, remove, - tx_key, idx, params); + err =__cfg80211_set_encryption (rdev, dev, pairwise, addr, + remove, tx_key, idx, params);wdev_unlock (dev->ieee80211_ptr);mutex_unlock (&rdev->devlist_mtx);
@@ -635,7 +645,7 @@ int cfg80211_wext_siwencode(struct net_delse if (!remove)return -EINVAL ; -return cfg80211_set_encryption (rdev, dev,NULL , remove, +return cfg80211_set_encryption (rdev, dev, false,NULL , remove, wdev->wext.default_key ==-1 , idx, ¶ms); }
@@ -725,7 +735,9 @@ int cfg80211_wext_siwencodeext(struct ne }return cfg80211_set_encryption ( - rdev, dev, addr, remove, + rdev, dev, + !(ext->ext_flags &IW_ENCODE_EXT_GROUP_KEY ), + addr, remove, ext->ext_flags &IW_ENCODE_EXT_SET_TX_KEY , idx, ¶ms); }
include/linux/nl80211.h +12 -0
@@ -812,6 +812,9 @@ enum nl80211_commands {* This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING * for non-automatic settings. * +* @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly +* means support for per-station GTKs. +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -979,6 +982,8 @@ enum nl80211_attrs {NL80211_ATTR_CONTROL_PORT_ETHERTYPE ,NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT , +NL80211_ATTR_SUPPORT_IBSS_RSN , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -1668,11 +1673,14 @@ enum nl80211_auth_type {* @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS) +* @NUM_NL80211_KEYTYPES: number of defined key types */ enum nl80211_key_type {NL80211_KEYTYPE_GROUP ,NL80211_KEYTYPE_PAIRWISE ,NL80211_KEYTYPE_PEERKEY , + +NUM_NL80211_KEYTYPES };/**
@@ -1703,6 +1711,9 @@ enum nl80211_wpa_versions {* CCMP keys, each six bytes in little endian * @NL80211_KEY_DEFAULT: flag indicating default key * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key +* @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not +* specified the default depends on whether a MAC address was +* given with the command using the key or not (u32) * @__NL80211_KEY_AFTER_LAST: internal * @NL80211_KEY_MAX: highest key attribute */
@@ -1714,6 +1725,7 @@ enum nl80211_key_attributes {NL80211_KEY_SEQ ,NL80211_KEY_DEFAULT ,NL80211_KEY_DEFAULT_MGMT , +NL80211_KEY_TYPE ,/* keep last */ __NL80211_KEY_AFTER_LAST,
net/mac80211/ieee80211_i.h +0 -2
@@ -548,8 +548,6 @@ struct ieee80211_sub_if_data {struct ieee80211_fragment_entry fragments[IEEE80211_FRAGMENT_MAX ];unsigned int fragment_next; -#define NUM_DEFAULT_KEYS 4 -#define NUM_DEFAULT_MGMT_KEYS 2struct ieee80211_key *keys[NUM_DEFAULT_KEYS +NUM_DEFAULT_MGMT_KEYS ];struct ieee80211_key *default_key;struct ieee80211_key *default_mgmt_key;
net/mac80211/key.h +3 -0
@@ -16,6 +16,9 @@#include <linux/rcupdate.h> #include <net/mac80211.h> +#define NUM_DEFAULT_KEYS 4 +#define NUM_DEFAULT_MGMT_KEYS 2 +#define WEP_IV_LEN 4#define WEP_ICV_LEN 4#define ALG_TKIP_KEY_LEN 32
Quoting "Johannes Berg" <[email protected]>:
include/net/cfg80211.h enum wiphy_flags { · line 1318
Quoted 6 lines
include/net/cfg80211.h +1
-0@@ -1312,6 +1314,7 @@ enum wiphy_flags {WIPHY_FLAG_4ADDR_AP =BIT (5 ),WIPHY_FLAG_4ADDR_STATION =BIT (6 ),WIPHY_FLAG_CONTROL_PORT_PROTOCOL =BIT (7 ), + WIPHY_FLAG_IBSS_RSN = BIT(7), };
This should be BIT(8), right?
-Jussi
Johannes Berg
maintainerQuoted 10 lines · Jussi Kivilinna
Quoting "Johannes Berg" <[email protected]>:
include/net/cfg80211.h enum wiphy_flags { · line 1318
Quoted 6 lines
include/net/cfg80211.h +1
-0@@ -1312,6 +1314,7 @@ enum wiphy_flags {WIPHY_FLAG_4ADDR_AP =BIT (5 ),WIPHY_FLAG_4ADDR_STATION =BIT (6 ),WIPHY_FLAG_CONTROL_PORT_PROTOCOL =BIT (7 ), + WIPHY_FLAG_IBSS_RSN = BIT(7), };This should be BIT(8), right?
Crap, yes, of course. I guess this overlapped with the patch that added the control port stuff. Since it's already merged, do you want to send a fixup?
johannes