diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-03-02 14:28:52 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:25 +0100 |
| commit | 820f7bd3b0b3c4e6c433fc6f69a14b02704aa718 (patch) | |
| tree | 7f9609dcfaa1719334fb29330164d49fb65ed093 /net/mac80211 | |
| parent | 23ca6642912d2ba7ffc332774490b54d1b831ed8 (diff) | |
mac80211: drop unencrypted frames in mesh fwding
commit d0c22119f574b851e63360c6b8660fe9593bbc3c upstream.
The mesh forwarding path was not checking that data
frames were protected when running an encrypted network;
add the necessary check.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 c0444a000776..6d0d37d6a6d7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1921,6 +1921,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) hdr = (struct ieee80211_hdr *) skb->data; mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); + if (ieee80211_drop_unencrypted(rx, hdr->frame_control)) + return RX_DROP_MONITOR; + /* frame is in RMC, don't forward */ if (ieee80211_is_data(hdr->frame_control) && is_multicast_ether_addr(hdr->addr1) && |