]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: check basic rates validity in sta_link_apply_parameters
authorMikhail Lobanov <m.lobanov@rosa.ru>
Mon, 17 Mar 2025 10:31:37 +0000 (13:31 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:26:16 +0000 (16:26 +0200)
commit 16ee3ea8faef8ff042acc15867a6c458c573de61 upstream.

When userspace sets supported rates for a new station via
NL80211_CMD_NEW_STATION, it might send a list that's empty
or contains only invalid values. Currently, we process these
values in sta_link_apply_parameters() without checking the result of
ieee80211_parse_bitrates(), which can lead to an empty rates bitmap.

A similar issue was addressed for NL80211_CMD_SET_BSS in commit
ce04abc3fcc6 ("wifi: mac80211: check basic rates validity").
This patch applies the same approach in sta_link_apply_parameters()
for NL80211_CMD_NEW_STATION, ensuring there is at least one valid
rate by inspecting the result of ieee80211_parse_bitrates().

Found by Linux Verification Center (linuxtesting.org) with Syzkaller.

Fixes: b95eb7f0eee4 ("wifi: cfg80211/mac80211: separate link params from station params")
Signed-off-by: Mikhail Lobanov <m.lobanov@rosa.ru>
Link: https://patch.msgid.link/20250317103139.17625-1-m.lobanov@rosa.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
[ Summary of conflict resolutions:
  - The function ieee80211_parse_bitrates() takes channel width as
    its first parameter, and the chandef struct has been refactored
    in kernel version 6.9, in commit
    6092077ad09ce880c61735c314060f0bd79ae4aa so that the width is
    contained in chanreq.oper.width. In kernel version 6.1 the
    width parameter is defined directly in the chandef struct. ]
Signed-off-by: Hanne-Lotta Mäenpää <hannelotta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/cfg.c

index be48d3f7ffcd619c03ae4bf346aa27ee376cce98..b42eb781d7f7cc55f745ca644fcf492720090910 100644 (file)
@@ -1735,12 +1735,12 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
        }
 
        if (params->supported_rates &&
-           params->supported_rates_len) {
-               ieee80211_parse_bitrates(link->conf->chandef.width,
-                                        sband, params->supported_rates,
-                                        params->supported_rates_len,
-                                        &link_sta->pub->supp_rates[sband->band]);
-       }
+           params->supported_rates_len &&
+           !ieee80211_parse_bitrates(link->conf->chandef.width,
+                                     sband, params->supported_rates,
+                                     params->supported_rates_len,
+                                     &link_sta->pub->supp_rates[sband->band]))
+               return -EINVAL;
 
        if (params->ht_capa)
                ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,