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

Merge tag 'mac80211-for-net-2021-06-09' of... 

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



Johannes berg says:

====================
A fair number of fixes:
 * fix more fallout from RTNL locking changes
 * fixes for some of the bugs found by syzbot
 * drop multicast fragments in mac80211 to align
   with the spec and what drivers are doing now
 * fix NULL-ptr deref in radiotap injection
====================

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

drivers/net/wireless/mac80211_hwsim.c

+5 −0
Original line number Diff line number Diff line
@@ -1693,8 +1693,13 @@ static int mac80211_hwsim_start(struct ieee80211_hw *hw) 
static void mac80211_hwsim_stop(struct ieee80211_hw *hw)

{

	struct mac80211_hwsim_data *data = hw->priv;



	data->started = false;

	hrtimer_cancel(&data->beacon_timer);



	while (!skb_queue_empty(&data->pending))

		ieee80211_free_txskb(hw, skb_dequeue(&data->pending));



	wiphy_dbg(hw->wiphy, "%s\n", __func__);

}

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -2284,7 +2284,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str 
	mon_wdev->iftype = NL80211_IFTYPE_MONITOR;

	mon_ndev->ieee80211_ptr = mon_wdev;



	ret = register_netdevice(mon_ndev);

	ret = cfg80211_register_netdevice(mon_ndev);

	if (ret) {

		goto out;

	}
@@ -2360,7 +2360,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy, 
	adapter = rtw_netdev_priv(ndev);

	pwdev_priv = adapter_wdev_data(adapter);



	unregister_netdevice(ndev);

	cfg80211_unregister_netdevice(ndev);



	if (ndev == pwdev_priv->pmon_ndev) {

		pwdev_priv->pmon_ndev = NULL;

include/net/mac80211.h

+7 −2
Original line number Diff line number Diff line
@@ -5537,7 +5537,7 @@ void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw, 
 *

 * This function iterates over the interfaces associated with a given

 * hardware that are currently active and calls the callback for them.

 * This version can only be used while holding the RTNL.

 * This version can only be used while holding the wiphy mutex.

 *

 * @hw: the hardware struct of which the interfaces should be iterated over

 * @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags
@@ -6392,7 +6392,12 @@ bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, 


/**

 * ieee80211_parse_tx_radiotap - Sanity-check and parse the radiotap header

 *				 of injected frames

 *				 of injected frames.

 *

 * To accurately parse and take into account rate and retransmission fields,

 * you must initialize the chandef field in the ieee80211_tx_info structure

 * of the skb before calling this function.

 *

 * @skb: packet injected by userspace

 * @dev: the &struct device of this 802.11 device

 */

net/mac80211/debugfs.c

+9 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright (C) 2018 - 2019, 2021 Intel Corporation

 */



#include <linux/debugfs.h>
@@ -387,10 +387,17 @@ static ssize_t reset_write(struct file *file, const char __user *user_buf, 
			   size_t count, loff_t *ppos)

{

	struct ieee80211_local *local = file->private_data;

	int ret;



	rtnl_lock();

	wiphy_lock(local->hw.wiphy);

	__ieee80211_suspend(&local->hw, NULL);

	__ieee80211_resume(&local->hw);

	ret = __ieee80211_resume(&local->hw);

	wiphy_unlock(local->hw.wiphy);



	if (ret)

		cfg80211_shutdown_all_interfaces(local->hw.wiphy);



	rtnl_unlock();



	return count;

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ ieee80211_get_sband(struct ieee80211_sub_if_data *sdata) 
	rcu_read_lock();

	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);



	if (WARN_ON_ONCE(!chanctx_conf)) {

	if (!chanctx_conf) {

		rcu_read_unlock();

		return NULL;

	}