summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorFelix Fietkau2010-01-07 20:23:53 +0100
committerJohn W. Linville2010-01-08 21:49:28 +0100
commitd79074488083ec0d7ecd15352192dc1631f25643 (patch)
tree3ba73d537ca84153bc6412bf5b9fdcdf1e3e56b9 /net/mac80211/rx.c
parentmac80211: fix queue selection for packets injected via monitor interface (diff)
downloadkernel-qcow2-linux-d79074488083ec0d7ecd15352192dc1631f25643.tar.gz
kernel-qcow2-linux-d79074488083ec0d7ecd15352192dc1631f25643.tar.xz
kernel-qcow2-linux-d79074488083ec0d7ecd15352192dc1631f25643.zip
mac80211: add missing sanity checks for action frames
Various missing sanity checks caused rejected action frames to be interpreted as channel switch announcements, which can cause a client mode interface to switch away from its operating channel, thereby losing connectivity. This patch ensures that only spectrum management action frames are processed by the CSA handling function and prevents rejected action frames from getting processed by the MLME code. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 54296999834b..82a30c1bf3ab 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2015,6 +2015,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
}
break;
default:
+ /* do not process rejected action frames */
+ if (mgmt->u.action.category & 0x80)
+ return RX_DROP_MONITOR;
+
return RX_CONTINUE;
}