diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-13 16:42:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-07 12:52:24 -0700 |
| commit | c52d6fec681236d2adc5cdfcc10e76c7baea455d (patch) | |
| tree | 493b3981177b65c0cc53d1d4b95a8867ef06508e /net | |
| parent | 524a8e8f658703d0e105bfb48c26edcdefc2aa3c (diff) | |
| download | linux-stable-c52d6fec681236d2adc5cdfcc10e76c7baea455d.tar.gz linux-stable-c52d6fec681236d2adc5cdfcc10e76c7baea455d.tar.bz2 linux-stable-c52d6fec681236d2adc5cdfcc10e76c7baea455d.zip | |
mac80211: fix AP-mode frame matching
commit 2b9ccd4e4308272e5aec614b77c5385e7ec2ec90 upstream.
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.
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 c6844ad080be..bb0b4577d0e6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3032,6 +3032,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)) |