]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: cfg80211: wext: validate chandef in monitor mode
authorKartik Nair <contact.kartikn@gmail.com>
Sun, 10 May 2026 20:24:37 +0000 (01:54 +0530)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 20 May 2026 09:44:19 +0000 (11:44 +0200)
cfg80211_wext_siwfreq() constructs a channel definition for monitor
mode but passes it to cfg80211_set_monitor_channel() without first
validating it with cfg80211_chandef_valid(). This causes a WARN_ON
in cfg80211_chandef_dfs_required() when it receives an invalid chandef.

Add the missing cfg80211_chandef_valid() check before calling
cfg80211_set_monitor_channel() to return -EINVAL early on invalid
channel definitions, consistent with how other callers handle this.

Reported-by: syzbot+02a1a03b8622d3c7d1c9@syzkaller.appspotmail.com
Signed-off-by: Kartik Nair <contact.kartikn@gmail.com>
Link: https://patch.msgid.link/20260510202437.7857-1-contact.kartikn@gmail.com
[clarify subject]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/wext-compat.c

index 22d9d9bae8f58ae03992acb1cb9ca07955d8003d..63d145b524c985bea6f90244d8888e85b6ffcf47 100644 (file)
@@ -789,6 +789,8 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
                chandef.chan = ieee80211_get_channel(&rdev->wiphy, freq);
                if (!chandef.chan)
                        return -EINVAL;
+               if (!cfg80211_chandef_valid(&chandef))
+                       return -EINVAL;
                return cfg80211_set_monitor_channel(rdev, dev, &chandef);
        case NL80211_IFTYPE_MESH_POINT:
                freq = cfg80211_wext_freq(wextfreq);