363-mac80211-accept-deauth-frames-in-IBSS-mode.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 95697f9907bfe3eab0ef20265a766b22e27dde64 Mon Sep 17 00:00:00 2001
  2. From: Johannes Berg <[email protected]>
  3. Date: Fri, 4 Oct 2019 15:37:05 +0300
  4. Subject: [PATCH] mac80211: accept deauth frames in IBSS mode
  5. We can process deauth frames and all, but we drop them very
  6. early in the RX path today - this could never have worked.
  7. Fixes: 2cc59e784b54 ("mac80211: reply to AUTH with DEAUTH if sta allocation fails in IBSS")
  8. Signed-off-by: Johannes Berg <[email protected]>
  9. Signed-off-by: Luca Coelho <[email protected]>
  10. Link: https://lore.kernel.org/r/[email protected]
  11. Signed-off-by: Johannes Berg <[email protected]>
  12. ---
  13. net/mac80211/rx.c | 11 ++++++++++-
  14. 1 file changed, 10 insertions(+), 1 deletion(-)
  15. --- a/net/mac80211/rx.c
  16. +++ b/net/mac80211/rx.c
  17. @@ -3467,9 +3467,18 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
  18. case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
  19. /* process for all: mesh, mlme, ibss */
  20. break;
  21. + case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
  22. + if (is_multicast_ether_addr(mgmt->da) &&
  23. + !is_broadcast_ether_addr(mgmt->da))
  24. + return RX_DROP_MONITOR;
  25. +
  26. + /* process only for station/IBSS */
  27. + if (sdata->vif.type != NL80211_IFTYPE_STATION &&
  28. + sdata->vif.type != NL80211_IFTYPE_ADHOC)
  29. + return RX_DROP_MONITOR;
  30. + break;
  31. case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
  32. case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
  33. - case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
  34. case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
  35. if (is_multicast_ether_addr(mgmt->da) &&
  36. !is_broadcast_ether_addr(mgmt->da))