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

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

mac80211: let key iteration get keys in install order 



ieee80211_iter_keys() currently returns keys in
the backward order they were installed in, which
is a bit confusing. Add them to the tail of the
key list to make sure iterations go in the same
order that keys were originally installed in.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8bca5d81

include/net/mac80211.h

+4 −0
Original line number Diff line number Diff line
@@ -2987,6 +2987,10 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw, 
 * needs reprogramming of the keys during suspend. Note that due

 * to locking reasons, it is also only safe to call this at few

 * spots since it must hold the RTNL and be able to sleep.

 *

 * The order in which the keys are iterated matches the order

 * in which they were originally installed and handed to the

 * set_key callback.

 */

void ieee80211_iter_keys(struct ieee80211_hw *hw,

			 struct ieee80211_vif *vif,

net/mac80211/key.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, 
	bool defunikey, defmultikey, defmgmtkey;



	if (new)

		list_add(&new->list, &sdata->key_list);

		list_add_tail(&new->list, &sdata->key_list);



	if (sta && pairwise) {

		rcu_assign_pointer(sta->ptk, new);