Commit c5e9e8d4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-for-net-2021-01-26' of... 

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

Johannes Berg says:

====================
A couple of fixes:
 * fix 160 MHz channel switch in mac80211
 * fix a staging driver to not deadlock due to some
   recent cfg80211 changes
 * fix NULL-ptr deref if cfg80211 returns -EINPROGRESS
   to wext (syzbot)
 * pause TX in mac80211 in type change to prevent crashes
   (syzbot)

* tag 'mac80211-for-net-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211:
  staging: rtl8723bs: fix wireless regulatory API misuse
  mac80211: pause TX while changing interface type
  wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
  mac80211: 160MHz with extended NSS BW in CSA
====================

Link: https://lore.kernel.org/r/20210126130529.75225-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents db22ce68 81f153fa

drivers/staging/rtl8723bs/include/rtw_wifi_regd.h

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ enum country_code_type_t { 
	COUNTRY_CODE_MAX

};



int rtw_regd_init(struct adapter *padapter,

void rtw_regd_init(struct wiphy *wiphy,

		   void (*reg_notifier)(struct wiphy *wiphy,

					struct regulatory_request *request));

void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -3211,9 +3211,6 @@ void rtw_cfg80211_init_wiphy(struct adapter *padapter) 
			rtw_cfg80211_init_ht_capab(&bands->ht_cap, NL80211_BAND_2GHZ, rf_type);

	}



	/* init regulary domain */

	rtw_regd_init(padapter, rtw_reg_notifier);



	/* copy mac_addr to wiphy */

	memcpy(wiphy->perm_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
@@ -3328,6 +3325,9 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev) 
	*((struct adapter **)wiphy_priv(wiphy)) = padapter;

	rtw_cfg80211_preinit_wiphy(padapter, wiphy);



	/* init regulary domain */

	rtw_regd_init(wiphy, rtw_reg_notifier);



	ret = wiphy_register(wiphy);

	if (ret < 0) {

		DBG_8192C("Couldn't register wiphy device\n");

drivers/staging/rtl8723bs/os_dep/wifi_regd.c

+3 −7
Original line number Diff line number Diff line
@@ -139,15 +139,11 @@ static void _rtw_regd_init_wiphy(struct rtw_regulatory *reg, 
	_rtw_reg_apply_flags(wiphy);

}



int rtw_regd_init(struct adapter *padapter,

void rtw_regd_init(struct wiphy *wiphy,

		   void (*reg_notifier)(struct wiphy *wiphy,

					struct regulatory_request *request))

{

	struct wiphy *wiphy = padapter->rtw_wdev->wiphy;



	_rtw_regd_init_wiphy(NULL, wiphy, reg_notifier);



	return 0;

}



void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ enum queue_stop_reason { 
	IEEE80211_QUEUE_STOP_REASON_FLUSH,

	IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN,

	IEEE80211_QUEUE_STOP_REASON_RESERVE_TID,

	IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE,



	IEEE80211_QUEUE_STOP_REASONS,

};

net/mac80211/iface.c

+6 −0
Original line number Diff line number Diff line
@@ -1617,6 +1617,10 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, 
	if (ret)

		return ret;



	ieee80211_stop_vif_queues(local, sdata,

				  IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE);

	synchronize_net();



	ieee80211_do_stop(sdata, false);



	ieee80211_teardown_sdata(sdata);
@@ -1639,6 +1643,8 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, 
	err = ieee80211_do_open(&sdata->wdev, false);

	WARN(err, "type change: do_open returned %d", err);



	ieee80211_wake_vif_queues(local, sdata,

				  IEEE80211_QUEUE_STOP_REASON_IFTYPE_CHANGE);

	return ret;

}