diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-13 16:42:40 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-16 22:38:07 +0200 |
| commit | 2b9ccd4e4308272e5aec614b77c5385e7ec2ec90 (patch) | |
| tree | 6eda5289eb8813f6207ba56676cf12f336659616 /net/mac80211 | |
| parent | a838490b493b56d523638c150985a2614d814b01 (diff) | |
| download | linux-3.10-2b9ccd4e4308272e5aec614b77c5385e7ec2ec90.tar.gz linux-3.10-2b9ccd4e4308272e5aec614b77c5385e7ec2ec90.tar.bz2 linux-3.10-2b9ccd4e4308272e5aec614b77c5385e7ec2ec90.zip | |
mac80211: fix AP-mode frame matching
In AP mode, ignore frames with mis-matched BSSID that aren't
multicast or sent to the correct destination. This fixes
reporting public action frames to userspace multiple times
on multiple virtual AP interfaces.
Cc: stable@vger.kernel.org
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c8447af76ea..8e295262025 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3036,6 +3036,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, * and location updates. Note that mac80211 * itself never looks at these frames. */ + if (!multicast && + !ether_addr_equal(sdata->vif.addr, hdr->addr1)) + return 0; if (ieee80211_is_public_action(hdr, skb->len)) return 1; if (!ieee80211_is_beacon(hdr->frame_control)) |