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

Merge tag 'mac80211-for-davem-2019-01-25' of... 

Merge tag 'mac80211-for-davem-2019-01-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just a few small fixes:
 * avoid trying to operate TDLS when not connection,
   this is not valid and led to issues
 * count TTL-dropped frames in mesh better
 * deal with new WiGig channels in regulatory code
 * remove a WARN_ON() that can trigger due to benign
   races during device/driver registration
 * fix nested netlink policy maxattrs (syzkaller)
 * fix hwsim n_limits (syzkaller)
 * propagate __aligned(2) to a surrounding struct
 * return proper error in virt_wifi error path
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e95d22c6 93183bdb

drivers/net/wireless/mac80211_hwsim.c

+5 −0
Original line number Diff line number Diff line
@@ -2761,6 +2761,11 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
					BIT(NL80211_CHAN_WIDTH_160);

	}



	if (!n_limits) {

		err = -EINVAL;

		goto failed_hw;

	}



	data->if_combination.n_limits = n_limits;

	data->if_combination.max_interfaces = 2048;

	data->if_combination.limits = data->if_limits;

drivers/net/wireless/virt_wifi.c

+3 −1
Original line number Diff line number Diff line
@@ -530,8 +530,10 @@ static int virt_wifi_newlink(struct net *src_net, struct net_device *dev, 
	SET_NETDEV_DEV(dev, &priv->lowerdev->dev);

	dev->ieee80211_ptr = kzalloc(sizeof(*dev->ieee80211_ptr), GFP_KERNEL);



	if (!dev->ieee80211_ptr)

	if (!dev->ieee80211_ptr) {

		err = -ENOMEM;

		goto remove_handler;

	}



	dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;

	dev->ieee80211_ptr->wiphy = common_wiphy;

net/mac80211/cfg.c

+4 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,10 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))

		sta->sta.tdls = true;



	if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION &&

	    !sdata->u.mgd.associated)

		return -EINVAL;



	err = sta_apply_parameters(local, sta, params);

	if (err) {

		sta_info_free(local, sta);

net/mac80211/rx.c

+4 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static void ieee80211_handle_mu_mimo_mon(struct ieee80211_sub_if_data *sdata, 
		struct ieee80211_hdr_3addr hdr;

		u8 category;

		u8 action_code;

	} __packed action;

	} __packed __aligned(2) action;



	if (!sdata)

		return;
@@ -2723,7 +2723,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
	skb_set_queue_mapping(skb, q);



	if (!--mesh_hdr->ttl) {

		IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);

		if (!is_multicast_ether_addr(hdr->addr1))

			IEEE80211_IFSTA_MESH_CTR_INC(ifmsh,

						     dropped_frames_ttl);

		goto out;

	}

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	},

	[NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1),

	[NL80211_ATTR_PEER_MEASUREMENTS] =

		NLA_POLICY_NESTED(NL80211_PMSR_FTM_REQ_ATTR_MAX,

		NLA_POLICY_NESTED(NL80211_PMSR_ATTR_MAX,

				  nl80211_pmsr_attr_policy),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE