]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: cfg80211: limit NAN func management APIs to offloaded DE
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Wed, 7 Jan 2026 12:15:56 +0000 (14:15 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 19 Jan 2026 09:18:25 +0000 (10:18 +0100)
A driver that declared that it has userspace DE should not call NAN func
related APIs such as cfg80211_nan_match and cfg80211_nan_func_terminated
Check and warn in such a case, as this indicates a driver bug.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260107141549.86fa96c75211.I8fbb0506377170dd7b41234f20bcba057951dd1e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/nl80211.c

index 3d74bea09ba3d344cc60d5c91892333f497d5e45..bcf30c5f5042f3061776271576049cf7cbc273ed 100644 (file)
@@ -16126,6 +16126,9 @@ void cfg80211_nan_match(struct wireless_dev *wdev,
        struct sk_buff *msg;
        void *hdr;
 
+       if (WARN_ON(wiphy->nan_capa.flags & WIPHY_NAN_FLAGS_USERSPACE_DE))
+               return;
+
        if (WARN_ON(!match->inst_id || !match->peer_inst_id || !match->addr))
                return;
 
@@ -16208,6 +16211,9 @@ void cfg80211_nan_func_terminated(struct wireless_dev *wdev,
        struct nlattr *func_attr;
        void *hdr;
 
+       if (WARN_ON(wiphy->nan_capa.flags & WIPHY_NAN_FLAGS_USERSPACE_DE))
+               return;
+
        if (WARN_ON(!inst_id))
                return;