diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-14 09:36:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 09:36:51 -0700 |
| commit | 2a2af5e6e6f55e8ec381f710b8765ffe2838e313 (patch) | |
| tree | 743a182912d7bb35ecc6b67e7323d3dd25869f3a /net/mac80211/rx.c | |
| parent | 4add700968c7761acba88e70a0aa3f44e5ad359d (diff) | |
| parent | b65842025335711e2a0259feb4dbadb0c9ffb6d9 (diff) | |
Merge tag 'mac80211-for-davem-2019-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Various fixes, all over:
* a few memory leaks
* fixes for management frame protection security
and A2/A3 confusion (affecting TDLS as well)
* build fix for certificates
* etc.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 25577ede2986..fd3740000e87 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3831,6 +3831,8 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx) case NL80211_IFTYPE_STATION: if (!bssid && !sdata->u.mgd.use_4addr) return false; + if (ieee80211_is_robust_mgmt_frame(skb) && !rx->sta) + return false; if (multicast) return true; return ether_addr_equal(sdata->vif.addr, hdr->addr1); |