Commit 33c568ba authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2020-06-29' of... 

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



Johannes Berg says:

====================
Couple of fixes/small things:
 * TX control port status check fixed to not assume frame format
 * mesh control port fixes
 * error handling/leak fixes when starting AP, with HE attributes
 * fix broadcast packet handling with encapsulation offload
 * add new AKM suites
 * and a small code cleanup
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a9b11101 60a0121f

include/linux/ieee80211.h

+4 −0
Original line number Diff line number Diff line
@@ -3333,13 +3333,17 @@ struct ieee80211_multiple_bssid_configuration { 
#define WLAN_AKM_SUITE_TDLS			SUITE(0x000FAC, 7)

#define WLAN_AKM_SUITE_SAE			SUITE(0x000FAC, 8)

#define WLAN_AKM_SUITE_FT_OVER_SAE		SUITE(0x000FAC, 9)

#define WLAN_AKM_SUITE_AP_PEER_KEY		SUITE(0x000FAC, 10)

#define WLAN_AKM_SUITE_8021X_SUITE_B		SUITE(0x000FAC, 11)

#define WLAN_AKM_SUITE_8021X_SUITE_B_192	SUITE(0x000FAC, 12)

#define WLAN_AKM_SUITE_FT_8021X_SHA384		SUITE(0x000FAC, 13)

#define WLAN_AKM_SUITE_FILS_SHA256		SUITE(0x000FAC, 14)

#define WLAN_AKM_SUITE_FILS_SHA384		SUITE(0x000FAC, 15)

#define WLAN_AKM_SUITE_FT_FILS_SHA256		SUITE(0x000FAC, 16)

#define WLAN_AKM_SUITE_FT_FILS_SHA384		SUITE(0x000FAC, 17)

#define WLAN_AKM_SUITE_OWE			SUITE(0x000FAC, 18)

#define WLAN_AKM_SUITE_FT_PSK_SHA384		SUITE(0x000FAC, 19)

#define WLAN_AKM_SUITE_PSK_SHA384		SUITE(0x000FAC, 20)



#define WLAN_MAX_KEY_LEN		32

net/mac80211/mesh_hwmp.c

+2 −5
Original line number Diff line number Diff line
@@ -1105,10 +1105,7 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata) 
			       ttl, lifetime, 0, ifmsh->preq_id++, sdata);



	spin_lock_bh(&mpath->state_lock);

	if (mpath->flags & MESH_PATH_DELETED) {

		spin_unlock_bh(&mpath->state_lock);

		goto enddiscovery;

	}

	if (!(mpath->flags & MESH_PATH_DELETED))

		mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);

	spin_unlock_bh(&mpath->state_lock);

net/mac80211/rx.c

+26 −0
Original line number Diff line number Diff line
@@ -2396,6 +2396,7 @@ static int ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx) 


static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)

{

	struct ieee80211_hdr *hdr = (void *)rx->skb->data;

	struct sk_buff *skb = rx->skb;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -2406,6 +2407,31 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc) 
	if (status->flag & RX_FLAG_DECRYPTED)

		return 0;



	/* check mesh EAPOL frames first */

	if (unlikely(rx->sta && ieee80211_vif_is_mesh(&rx->sdata->vif) &&

		     ieee80211_is_data(fc))) {

		struct ieee80211s_hdr *mesh_hdr;

		u16 hdr_len = ieee80211_hdrlen(fc);

		u16 ethertype_offset;

		__be16 ethertype;



		if (!ether_addr_equal(hdr->addr1, rx->sdata->vif.addr))

			goto drop_check;



		/* make sure fixed part of mesh header is there, also checks skb len */

		if (!pskb_may_pull(rx->skb, hdr_len + 6))

			goto drop_check;



		mesh_hdr = (struct ieee80211s_hdr *)(skb->data + hdr_len);

		ethertype_offset = hdr_len + ieee80211_get_mesh_hdrlen(mesh_hdr) +

				   sizeof(rfc1042_header);



		if (skb_copy_bits(rx->skb, ethertype_offset, &ethertype, 2) == 0 &&

		    ethertype == rx->sdata->control_port_protocol)

			return 0;

	}



drop_check:

	/* Drop unencrypted frames if key is set. */

	if (unlikely(!ieee80211_has_protected(fc) &&

		     !ieee80211_is_any_nullfunc(fc) &&

net/mac80211/status.c

+15 −7
Original line number Diff line number Diff line
@@ -639,11 +639,23 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local, 
		u64 cookie = IEEE80211_SKB_CB(skb)->ack.cookie;

		struct ieee80211_sub_if_data *sdata;

		struct ieee80211_hdr *hdr = (void *)skb->data;

		__be16 ethertype = 0;



		if (skb->len >= ETH_HLEN && skb->protocol == cpu_to_be16(ETH_P_802_3))

			skb_copy_bits(skb, 2 * ETH_ALEN, &ethertype, ETH_TLEN);



		rcu_read_lock();

		sdata = ieee80211_sdata_from_skb(local, skb);

		if (sdata) {

			if (ieee80211_is_any_nullfunc(hdr->frame_control))

			if (ethertype == sdata->control_port_protocol ||

			    ethertype == cpu_to_be16(ETH_P_PREAUTH))

				cfg80211_control_port_tx_status(&sdata->wdev,

								cookie,

								skb->data,

								skb->len,

								acked,

								GFP_ATOMIC);

			else if (ieee80211_is_any_nullfunc(hdr->frame_control))

				cfg80211_probe_status(sdata->dev, hdr->addr1,

						      cookie, acked,

						      info->status.ack_signal,
@@ -654,12 +666,8 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local, 
							skb->data, skb->len,

							acked, GFP_ATOMIC);

			else

				cfg80211_control_port_tx_status(&sdata->wdev,

								cookie,

								skb->data,

								skb->len,

								acked,

								GFP_ATOMIC);

				pr_warn("Unknown status report in ack skb\n");



		}

		rcu_read_unlock();

net/mac80211/tx.c

+6 −2
Original line number Diff line number Diff line
@@ -3996,6 +3996,9 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, 
	skb_list_walk_safe(skb, skb, next) {

		skb_mark_not_on_list(skb);



		if (skb->protocol == sdata->control_port_protocol)

			ctrl_flags |= IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP;



		skb = ieee80211_build_hdr(sdata, skb, info_flags,

					  sta, ctrl_flags, cookie);

		if (IS_ERR(skb)) {
@@ -4206,7 +4209,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, 
	    (!sta || !test_sta_flag(sta, WLAN_STA_TDLS_PEER)))

		ra = sdata->u.mgd.bssid;



	if (!is_valid_ether_addr(ra))

	if (is_zero_ether_addr(ra))

		goto out_free;



	multicast = is_multicast_ether_addr(ra);
@@ -5371,7 +5374,8 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;



	if (proto == sdata->control_port_protocol)

		ctrl_flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO;

		ctrl_flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO |

			      IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP;



	if (unencrypted)

		flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE