diff options
| author | Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2026-01-07 14:15:56 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2026-01-19 10:18:25 +0100 |
| commit | f816141cbae2014e87950cc5e4e336a6420d1096 (patch) | |
| tree | 9619b7751e6bc91ace610b35143eedd59e18ee15 | |
| parent | e1696c8bd0056bc1a5f7766f58ac333adc203e8a (diff) | |
wifi: cfg80211: limit NAN func management APIs to offloaded DE
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>
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3d74bea09ba3..bcf30c5f5042 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -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; |