linux-kernel - [PATCH] wifi: mt76: inititalize sband.band to correct value

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240207000130.4040-1-spasswolf@web.de>
Date: Wed,  7 Feb 2024 01:01:30 +0100
From: Bert Karwatzki <spasswolf@....de>
To: Lorenzo Bianconi <lorenzo@...nel.org>,
	Felix Fietkau <nbd@....name>,
	Ryder Lee <ryder.lee@...iatek.com>
Cc: Bert Karwatzki <spasswolf@....de>,
	linux-kernel@...r.kernel.org,
	linux-wireless@...r.kernel.org,
	Johannes Berg <johannes.berg@...el.com>
Subject: [PATCH] wifi: mt76: inititalize sband.band to correct value

Set phy->sband_{2,5,6}g.sband.band to the correct enum value, otherwise
the ieee80211_register_hw() will fail to register the device.

Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=218466

Signed-off-by: Bert Karwatzki <spasswolf@....de>
---
 drivers/net/wireless/mediatek/mt76/mac80211.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 8a3a90d1bfac..6cf08446f445 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -363,6 +363,7 @@ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates,
 		   int n_rates)
 {
 	phy->hw->wiphy->bands[NL80211_BAND_2GHZ] = &phy->sband_2g.sband;
+	phy->sband_2g.sband.band = NL80211_BAND_2GHZ;

 	return mt76_init_sband(phy, &phy->sband_2g, mt76_channels_2ghz,
 			       ARRAY_SIZE(mt76_channels_2ghz), rates,
@@ -374,6 +375,7 @@ mt76_init_sband_5g(struct mt76_phy *phy, struct ieee80211_rate *rates,
 		   int n_rates, bool vht)
 {
 	phy->hw->wiphy->bands[NL80211_BAND_5GHZ] = &phy->sband_5g.sband;
+	phy->sband_5g.sband.band = NL80211_BAND_5GHZ;

 	return mt76_init_sband(phy, &phy->sband_5g, mt76_channels_5ghz,
 			       ARRAY_SIZE(mt76_channels_5ghz), rates,
@@ -385,6 +387,7 @@ mt76_init_sband_6g(struct mt76_phy *phy, struct ieee80211_rate *rates,
 		   int n_rates)
 {
 	phy->hw->wiphy->bands[NL80211_BAND_6GHZ] = &phy->sband_6g.sband;
+	phy->sband_6g.sband.band = NL80211_BAND_6GHZ;

 	return mt76_init_sband(phy, &phy->sband_6g, mt76_channels_6ghz,
 			       ARRAY_SIZE(mt76_channels_6ghz), rates,
--
2.39.2

When using linux-next-20240205 my mediatek wifi device failed to start.
A bisection led to commit f04d2c247e0407 as the problem:
https://bugzilla.kernel.org/show_bug.cgi?id=218466
After closer examination of the mt76 code it the problem was to to be
the incomplete initialization of phy->sband_{2,5,6}g. The band field has
to be set to not confuse the new mac80211 code. (the sband_2g structure
was correctly initialized accidendly as NL80211_BAND_2GHZ is 0).

Bert Karwatzki