Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b96766f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix key vs. sta locking problems 



Up to now, key manipulation is supposed to run under RTNL to
avoid concurrent manipulations and also allow the set_key()
hardware callback to sleep. This is not feasible because STA
structs are rcu-protected and thus a lot of operations there
cannot take the RTNL. Also, key references are rcu-protected
so we cannot do things atomically.

This patch changes key locking completely:
 * key operations are now atomic
 * hardware crypto offload is enabled and disabled from
   a workqueue, due to that key freeing is also delayed
 * debugfs code is also run from a workqueue
 * keys reference STAs (and vice versa!) so during STA
   unlink the STAs key reference is removed but not the
   keys STA reference, to avoid races key todo work is
   run before STA destruction.
 * fewer STA operations now need the RTNL which was
   required due to key operations

This fixes the locking problems lockdep pointed out and also
makes things more light-weight because the rtnl isn't required
as much.

Note that the key todo lock/key mutex are global locks, this
is not required, of course, they could be per-hardware instead.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7d1559f1

net/mac80211/cfg.c

+34 −10
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	struct sta_info *sta = NULL;

	enum ieee80211_key_alg alg;

	struct ieee80211_key *key;

	int err;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -157,17 +158,24 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	if (!key)

		return -ENOMEM;



	rcu_read_lock();



	if (mac_addr) {

		sta = sta_info_get(sdata->local, mac_addr);

		if (!sta) {

			ieee80211_key_free(key);

			return -ENOENT;

			err = -ENOENT;

			goto out_unlock;

		}

	}



	ieee80211_key_link(key, sdata, sta);



	return 0;

	err = 0;

 out_unlock:

	rcu_read_unlock();



	return err;

}



static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
@@ -179,28 +187,37 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, 


	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	rcu_read_lock();



	if (mac_addr) {

		ret = -ENOENT;



		sta = sta_info_get(sdata->local, mac_addr);

		if (!sta)

			return -ENOENT;

			goto out_unlock;



		ret = 0;

		if (sta->key) {

			ieee80211_key_free(sta->key);

			WARN_ON(sta->key);

		} else

			ret = -ENOENT;

			ret = 0;

		}



		return ret;

		goto out_unlock;

	}



	if (!sdata->keys[key_idx])

		return -ENOENT;

	if (!sdata->keys[key_idx]) {

		ret = -ENOENT;

		goto out_unlock;

	}



	ieee80211_key_free(sdata->keys[key_idx]);

	WARN_ON(sdata->keys[key_idx]);



	return 0;

	ret = 0;

 out_unlock:

	rcu_read_unlock();



	return ret;

}



static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
@@ -217,6 +234,8 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
	u16 iv16;

	int err = -ENOENT;



	rcu_read_lock();



	if (mac_addr) {

		sta = sta_info_get(sdata->local, mac_addr);

		if (!sta)
@@ -280,6 +299,7 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
	err = 0;



 out:

	rcu_read_unlock();

	return err;

}
@@ -289,9 +309,13 @@ static int ieee80211_config_default_key(struct wiphy *wiphy, 
{

	struct ieee80211_sub_if_data *sdata;



	rcu_read_lock();



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	ieee80211_set_default_key(sdata, key_idx);



	rcu_read_unlock();



	return 0;

}

net/mac80211/debugfs_key.c

+18 −19
Original line number Diff line number Diff line
@@ -184,23 +184,35 @@ KEY_OPS(key); 
	key->debugfs.name = debugfs_create_file(#name, 0400,\

				key->debugfs.dir, key, &key_##name##_ops);



void ieee80211_debugfs_key_add(struct ieee80211_local *local,

			       struct ieee80211_key *key)

void ieee80211_debugfs_key_add(struct ieee80211_key *key)

  {

	static int keycount;

	char buf[20];

	char buf[50];

	DECLARE_MAC_BUF(mac);

	struct sta_info *sta;



	if (!local->debugfs.keys)

	if (!key->local->debugfs.keys)

		return;



	sprintf(buf, "%d", keycount);

	keycount++;

	key->debugfs.dir = debugfs_create_dir(buf,

					local->debugfs.keys);

					key->local->debugfs.keys);



	if (!key->debugfs.dir)

		return;



	rcu_read_lock();

	sta = rcu_dereference(key->sta);

	if (sta)

		sprintf(buf, "../../stations/%s", print_mac(mac, sta->addr));

	rcu_read_unlock();



	/* using sta as a boolean is fine outside RCU lock */

	if (sta)

		key->debugfs.stalink =

			debugfs_create_symlink("station", key->debugfs.dir, buf);



	DEBUGFS_ADD(keylen);

	DEBUGFS_ADD(flags);

	DEBUGFS_ADD(keyidx);
@@ -258,19 +270,6 @@ void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata) 
	debugfs_remove(sdata->debugfs.default_key);

	sdata->debugfs.default_key = NULL;

}

void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key,

				    struct sta_info *sta)

{

	char buf[50];

	DECLARE_MAC_BUF(mac);



	if (!key->debugfs.dir)

		return;



	sprintf(buf, "../../stations/%s", print_mac(mac, sta->addr));

	key->debugfs.stalink =

		debugfs_create_symlink("station", key->debugfs.dir, buf);

}



void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,

				   struct sta_info *sta)

net/mac80211/debugfs_key.h

+2 −9
Original line number Diff line number Diff line
@@ -2,18 +2,14 @@ 
#define __MAC80211_DEBUGFS_KEY_H



#ifdef CONFIG_MAC80211_DEBUGFS

void ieee80211_debugfs_key_add(struct ieee80211_local *local,

			       struct ieee80211_key *key);

void ieee80211_debugfs_key_add(struct ieee80211_key *key);

void ieee80211_debugfs_key_remove(struct ieee80211_key *key);

void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata);

void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata);

void ieee80211_debugfs_key_sta_link(struct ieee80211_key *key,

				    struct sta_info *sta);

void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,

				   struct sta_info *sta);

#else

static inline void ieee80211_debugfs_key_add(struct ieee80211_local *local,

					     struct ieee80211_key *key)

static inline void ieee80211_debugfs_key_add(struct ieee80211_key *key)

{}

static inline void ieee80211_debugfs_key_remove(struct ieee80211_key *key)

{}
@@ -23,9 +19,6 @@ static inline void ieee80211_debugfs_key_add_default( 
static inline void ieee80211_debugfs_key_remove_default(

	struct ieee80211_sub_if_data *sdata)

{}

static inline void ieee80211_debugfs_key_sta_link(

	struct ieee80211_key *key, struct sta_info *sta)

{}

static inline void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key,

						 struct sta_info *sta)

{}

net/mac80211/ieee80211.c

+6 −0
Original line number Diff line number Diff line
@@ -1868,6 +1868,12 @@ static void __exit ieee80211_exit(void) 
{

	rc80211_pid_exit();



	/*

	 * For key todo, it'll be empty by now but the work

	 * might still be scheduled.

	 */

	flush_scheduled_work();



	if (mesh_allocated)

		ieee80211s_stop();

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -600,8 +600,8 @@ struct ieee80211_local { 
	/*

	 * The lock only protects the list, hash, timer and counter

	 * against manipulation, reads are done in RCU. Additionally,

	 * the lock protects each BSS's TIM bitmap and a few items

	 * in a STA info structure.

	 * the lock protects each BSS's TIM bitmap, a few items in

	 * STA info structures and various key pointers.

	 */

	spinlock_t sta_lock;

	unsigned long num_sta;