Commit 1626e0fa authored Jan 11, 2013 by Johannes Berg

mac80211: fix FT roaming



During FT roaming, wpa_supplicant attempts to set the
key before association. This used to be rejected, but
as a side effect of my commit 66e67e41
("mac80211: redesign auth/assoc") the key was accepted
causing hardware crypto to not be used for it as the
station isn't added to the driver yet.

It would be possible to accept the key and then add it
to the driver when the station has been added. However,
this may run into issues with drivers using the state-
based station adding if they accept the key only after
association like it used to be.

For now, revert to the behaviour from before the auth
and assoc change.

Cc: stable@vger.kernel.org
Reported-by: Cédric Debarge <cedric.debarge@acksys.fr>
Tested-by: Cédric Debarge <cedric.debarge@acksys.fr>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 09b1426e

net/mac80211/cfg.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,17 @@ static int ieee80211_add_key(struct wiphy wiphy, struct net_device dev,
		sta = sta_info_get(sdata, mac_addr);
		else
		sta = sta_info_get_bss(sdata, mac_addr);
		if (!sta) {
		/*
		* The ASSOC test makes sure the driver is ready to
		* receive the key. When wpa_supplicant has roamed
		* using FT, it attempts to set the key before
		* association has completed, this rejects that attempt
		* so it will set the key again after assocation.
		*
		* TODO: accept the key if we have a station entry and
		* add it to the device after the station.
		*/
		if (!sta \|\| !test_sta_flag(sta, WLAN_STA_ASSOC)) {
		ieee80211_key_free(sdata->local, key);
		err = -ENOENT;
		goto out_unlock;

Admin message