]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: rtw89: Fix inadverent sharing of struct ieee80211_supported_band data
authorOndrej Jirman <megi@xff.cz>
Tue, 29 Apr 2025 12:29:11 +0000 (14:29 +0200)
committerPing-Ke Shih <pkshih@realtek.com>
Mon, 5 May 2025 02:16:22 +0000 (10:16 +0800)
Internally wiphy writes to individual channels in this structure,
so we must not share one static definition of channel list between
multiple device instances, because that causes hard to debug
breakage.

For example, with two rtw89 driven devices in the system, channel
information may get incoherent, preventing channel use.

Signed-off-by: Ondrej Jirman <megi@xff.cz>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250429122916.1734879-3-megi@xff.cz
drivers/net/wireless/realtek/rtw89/core.c

index 5815ca0a1b296c73fb4acf8009bb5dc0c64d4a6f..e681e8abc20d16d8762fb762f91668baa16edecd 100644 (file)
@@ -4429,17 +4429,40 @@ static int rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev,
        return 0;
 }
 
+static struct ieee80211_supported_band *
+rtw89_core_sband_dup(struct rtw89_dev *rtwdev,
+                    const struct ieee80211_supported_band *sband)
+{
+       struct ieee80211_supported_band *dup;
+
+       dup = devm_kmemdup(rtwdev->dev, sband, sizeof(*sband), GFP_KERNEL);
+       if (!dup)
+               return NULL;
+
+       dup->channels = devm_kmemdup(rtwdev->dev, sband->channels,
+                                    sizeof(*sband->channels) * sband->n_channels,
+                                    GFP_KERNEL);
+       if (!dup->channels)
+               return NULL;
+
+       dup->bitrates = devm_kmemdup(rtwdev->dev, sband->bitrates,
+                                    sizeof(*sband->bitrates) * sband->n_bitrates,
+                                    GFP_KERNEL);
+       if (!dup->bitrates)
+               return NULL;
+
+       return dup;
+}
+
 static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev)
 {
        struct ieee80211_hw *hw = rtwdev->hw;
        struct ieee80211_supported_band *sband;
-       u32 size = sizeof(struct ieee80211_supported_band);
        u8 support_bands = rtwdev->chip->support_bands;
-       struct device *dev = rtwdev->dev;
        int ret;
 
        if (support_bands & BIT(NL80211_BAND_2GHZ)) {
-               sband = devm_kmemdup(dev, &rtw89_sband_2ghz, size, GFP_KERNEL);
+               sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_2ghz);
                if (!sband)
                        return -ENOMEM;
                rtw89_init_ht_cap(rtwdev, &sband->ht_cap);
@@ -4450,7 +4473,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev)
        }
 
        if (support_bands & BIT(NL80211_BAND_5GHZ)) {
-               sband = devm_kmemdup(dev, &rtw89_sband_5ghz, size, GFP_KERNEL);
+               sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_5ghz);
                if (!sband)
                        return -ENOMEM;
                rtw89_init_ht_cap(rtwdev, &sband->ht_cap);
@@ -4462,7 +4485,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev)
        }
 
        if (support_bands & BIT(NL80211_BAND_6GHZ)) {
-               sband = devm_kmemdup(dev, &rtw89_sband_6ghz, size, GFP_KERNEL);
+               sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_6ghz);
                if (!sband)
                        return -ENOMEM;
                ret = rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_6GHZ, sband);