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

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

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



Johannes Berg says:

====================
A couple of fixes:
 * three netlink validation fixes
 * a mesh path selection fix
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2165fdf4 ba32679c

net/mac80211/mesh_hwmp.c

+2 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,8 @@ int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata, 
		}

	}



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

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

	    mesh_path_sel_is_hwmp(sdata))

		mesh_queue_preq(mpath, PREQ_Q_F_START);



	if (skb_queue_len(&mpath->frame_queue) >= MESH_FRAME_QUEUE_LEN)

net/wireless/nl80211.c

+5 −0
Original line number Diff line number Diff line
@@ -470,6 +470,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_WOWLAN_TRIGGERS] = { .type = NLA_NESTED },

	[NL80211_ATTR_STA_PLINK_STATE] =

		NLA_POLICY_MAX(NLA_U8, NUM_NL80211_PLINK_STATES - 1),

	[NL80211_ATTR_MEASUREMENT_DURATION] = { .type = NLA_U16 },

	[NL80211_ATTR_MEASUREMENT_DURATION_MANDATORY] = { .type = NLA_FLAG },

	[NL80211_ATTR_MESH_PEER_AID] =

		NLA_POLICY_RANGE(NLA_U16, 1, IEEE80211_MAX_AID),

	[NL80211_ATTR_SCHED_SCAN_INTERVAL] = { .type = NLA_U32 },
@@ -531,6 +533,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_MDID] = { .type = NLA_U16 },

	[NL80211_ATTR_IE_RIC] = { .type = NLA_BINARY,

				  .len = IEEE80211_MAX_DATA_LEN },

	[NL80211_ATTR_CRIT_PROT_ID] = { .type = NLA_U16 },

	[NL80211_ATTR_MAX_CRIT_PROT_DURATION] = { .type = NLA_U16 },

	[NL80211_ATTR_PEER_AID] =

		NLA_POLICY_RANGE(NLA_U16, 1, IEEE80211_MAX_AID),

	[NL80211_ATTR_CH_SWITCH_COUNT] = { .type = NLA_U32 },
@@ -561,6 +565,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
		NLA_POLICY_MAX(NLA_U8, IEEE80211_NUM_UPS - 1),

	[NL80211_ATTR_ADMITTED_TIME] = { .type = NLA_U16 },

	[NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 },

	[NL80211_ATTR_OPER_CLASS] = { .type = NLA_U8 },

	[NL80211_ATTR_MAC_MASK] = {

		.type = NLA_EXACT_LEN_WARN,

		.len = ETH_ALEN

CRA Git | Maintained and supported by SUSTech CRA and CCSE