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

Commit 7b4396bd authored Feb 23, 2013 by Johannes Berg

mac80211: flush keys when stopping AP



Since hostapd will remove keys this isn't usually
an issue, but we shouldn't leak keys to the next
BSS started on the same interface. For VLANs this
also fixes a bug, keys that aren't removed would
otherwise be leaked.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 8d1f7ecd

net/mac80211/cfg.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1035,9 +1035,12 @@ static int ieee80211_stop_ap(struct wiphy wiphy, struct net_device dev)
		sta_info_flush_defer(vlan);
		sta_info_flush_defer(sdata);
		rcu_barrier();
		list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
		list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
		sta_info_flush_cleanup(vlan);
		ieee80211_free_keys(vlan);
		}
		sta_info_flush_cleanup(sdata);
		ieee80211_free_keys(sdata);

		sdata->vif.bss_conf.enable_beacon = false;
		clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

net/mac80211/iface.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -840,7 +840,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,

		/*
		* Free all remaining keys, there shouldn't be any,
		* except maybe group keys in AP more or WDS?
		* except maybe in WDS mode?
		*/
		ieee80211_free_keys(sdata);