Commit 328f5bb9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2020-03-26' of... 

Merge tag 'mac80211-for-net-2020-03-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
We have the following fixes:
 * drop data packets if there's no key for them anymore, after
   there had been one, to avoid sending them in clear when
   hostapd removes the key before it removes the station and
   the packets are still queued
 * check port authorization again after dequeue, to avoid
   sending packets if the station is no longer authorized
 * actually remove the authorization flag before the key so
   packets are also dropped properly because of this
 * fix nl80211 control port packet tagging to handle them as
   packets allowed to go out without encryption
 * fix NL80211_ATTR_CHANNEL_WIDTH outgoing netlink attribute
   width (should be 32 bits, not 8)
 * don't WARN in a CSA scenario that happens on some APs
 * fix HE spatial reuse element size calculation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f6bf1baf b95d2ccd

include/linux/ieee80211.h

+2 −2
Original line number Diff line number Diff line
@@ -2102,14 +2102,14 @@ ieee80211_he_spr_size(const u8 *he_spr_ie) 
{

	struct ieee80211_he_spr *he_spr = (void *)he_spr_ie;

	u8 spr_len = sizeof(struct ieee80211_he_spr);

	u32 he_spr_params;

	u8 he_spr_params;



	/* Make sure the input is not NULL */

	if (!he_spr_ie)

		return 0;



	/* Calc required length */

	he_spr_params = le32_to_cpu(he_spr->he_sr_control);

	he_spr_params = he_spr->he_sr_control;

	if (he_spr_params & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT)

		spr_len++;

	if (he_spr_params & IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT)

net/mac80211/debugfs_sta.c

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright(c) 2016 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright (C) 2018 - 2020 Intel Corporation

 */



#include <linux/debugfs.h>
@@ -78,6 +78,7 @@ static const char * const sta_flag_names[] = { 
	FLAG(MPSP_OWNER),

	FLAG(MPSP_RECIPIENT),

	FLAG(PS_DELIVER),

	FLAG(USES_ENCRYPTION),

#undef FLAG

};

net/mac80211/key.c

+12 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Copyright 2007-2008	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2015-2017	Intel Deutschland GmbH

 * Copyright 2018-2019  Intel Corporation

 * Copyright 2018-2020  Intel Corporation

 */



#include <linux/if_ether.h>
@@ -262,22 +262,29 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) 
			  sta ? sta->sta.addr : bcast_addr, ret);

}



int ieee80211_set_tx_key(struct ieee80211_key *key)

static int _ieee80211_set_tx_key(struct ieee80211_key *key, bool force)

{

	struct sta_info *sta = key->sta;

	struct ieee80211_local *local = key->local;



	assert_key_lock(local);



	set_sta_flag(sta, WLAN_STA_USES_ENCRYPTION);



	sta->ptk_idx = key->conf.keyidx;



	if (!ieee80211_hw_check(&local->hw, AMPDU_KEYBORDER_SUPPORT))

	if (force || !ieee80211_hw_check(&local->hw, AMPDU_KEYBORDER_SUPPORT))

		clear_sta_flag(sta, WLAN_STA_BLOCK_BA);

	ieee80211_check_fast_xmit(sta);



	return 0;

}



int ieee80211_set_tx_key(struct ieee80211_key *key)

{

	return _ieee80211_set_tx_key(key, false);

}



static void ieee80211_pairwise_rekey(struct ieee80211_key *old,

				     struct ieee80211_key *new)

{
@@ -441,11 +448,8 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, 
		if (pairwise) {

			rcu_assign_pointer(sta->ptk[idx], new);

			if (new &&

			    !(new->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX)) {

				sta->ptk_idx = idx;

				clear_sta_flag(sta, WLAN_STA_BLOCK_BA);

				ieee80211_check_fast_xmit(sta);

			}

			    !(new->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX))

				_ieee80211_set_tx_key(new, true);

		} else {

			rcu_assign_pointer(sta->gtk[idx], new);

		}

net/mac80211/sta_info.c

+6 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2019 Intel Corporation

 * Copyright (C) 2018-2020 Intel Corporation

 */



#include <linux/module.h>
@@ -1049,6 +1049,11 @@ static void __sta_info_destroy_part2(struct sta_info *sta) 
	might_sleep();

	lockdep_assert_held(&local->sta_mtx);



	while (sta->sta_state == IEEE80211_STA_AUTHORIZED) {

		ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);

		WARN_ON_ONCE(ret);

	}



	/* now keys can no longer be reached */

	ieee80211_free_sta_keys(local, sta);

net/mac80211/sta_info.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ enum ieee80211_sta_info_flags { 
	WLAN_STA_MPSP_OWNER,

	WLAN_STA_MPSP_RECIPIENT,

	WLAN_STA_PS_DELIVER,

	WLAN_STA_USES_ENCRYPTION,



	NUM_WLAN_STA_FLAGS,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE