Commit 15c8795d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Johannes Berg says:

====================
Just a few small updates:
 * fix an integer overflow in nl80211
 * fix rtw89 8852AE disconnections
 * fix a buffer overflow in ath12k
 * fix AP_VLAN configuration lookups
 * fix allocation failure handling in brcm80211
 * update MAINTAINERS for some drivers

* tag 'wireless-2023-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: ath12k: Fix buffer overflow when scanning with extraie
  wifi: nl80211: fix integer overflow in nl80211_parse_mbssid_elems()
  wifi: cfg80211: fix sband iftype data lookup for AP_VLAN
  wifi: rtw89: fix 8852AE disconnection caused by RX full flags
  MAINTAINERS: Remove tree entry for rtl8180
  MAINTAINERS: Update entry for rtl8187
  wifi: brcm80211: handle params_v1 allocation failure
====================

Link: https://lore.kernel.org/r/20230809124818.167432-2-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents acaaffc5 06f2ab86

MAINTAINERS

+1 −4
Original line number Diff line number Diff line
@@ -18507,17 +18507,14 @@ RTL8180 WIRELESS DRIVER 
L:	linux-wireless@vger.kernel.org

S:	Orphan

W:	https://wireless.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

F:	drivers/net/wireless/realtek/rtl818x/rtl8180/









RTL8187 WIRELESS DRIVER









M:	Herton Ronaldo Krzesinski <herton@canonical.com>









M:	Hin-Tak Leung <htl10@users.sourceforge.net>









M:	Hin-Tak Leung <hintak.leung@gmail.com>









M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git









F:	drivers/net/wireless/realtek/rtl818x/rtl8187/

















RTL8XXXU WIRELESS DRIVER (rtl8xxxu)

























drivers/net/wireless/ath/ath12k/wmi.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -2144,8 +2144,7 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,







	struct wmi_tlv *tlv;









	void *ptr;









	int i, ret, len;









	u32 *tmp_ptr;









	u8 extraie_len_with_pad = 0;









	u32 *tmp_ptr, extraie_len_with_pad = 0;









	struct ath12k_wmi_hint_short_ssid_arg *s_ssid = NULL;









	struct ath12k_wmi_hint_bssid_arg *hint_bssid = NULL;










































drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -1456,6 +1456,10 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,







		params_size -= BRCMF_SCAN_PARAMS_V2_FIXED_SIZE;









		params_size += BRCMF_SCAN_PARAMS_FIXED_SIZE;









		params_v1 = kzalloc(params_size, GFP_KERNEL);









		if (!params_v1) {









			err = -ENOMEM;









			goto exit_params;









		}









		params_v1->version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);









		brcmf_scan_params_v2_to_v1(&params->params_v2_le, &params_v1->params_le);









		kfree(params);








@@ -1473,6 +1477,7 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,







			bphy_err(drvr, "error (%d)\n", err);









	}



















exit_params:









	kfree(params);









exit:









	return err;
































drivers/net/wireless/realtek/rtw89/mac.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2524,7 +2524,7 @@ static int cmac_dma_init(struct rtw89_dev *rtwdev, u8 mac_idx)







	u32 reg;









	int ret;



















	if (chip_id != RTL8852A && chip_id != RTL8852B)









	if (chip_id != RTL8852B)









		return 0;



















	ret = rtw89_mac_check_mac_en(rtwdev, mac_idx, RTW89_CMAC_SEL);
































include/net/cfg80211.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -562,6 +562,9 @@ ieee80211_get_sband_iftype_data(const struct ieee80211_supported_band *sband,







	if (WARN_ON(iftype >= NL80211_IFTYPE_MAX))









		return NULL;



















	if (iftype == NL80211_IFTYPE_AP_VLAN)









		iftype = NL80211_IFTYPE_AP;



















	for (i = 0; i < sband->n_iftype_data; i++)  {









		const struct ieee80211_sband_iftype_data *data =









			&sband->iftype_data[i];