diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-03-02 14:28:52 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 14:14:08 +0200 |
| commit | ece2f78311f6370ac91e79cac57376f21e545fd6 (patch) | |
| tree | 2975dab961756bad3fe6821ed9cecba41675e1e3 | |
| parent | 12b6060a75b6c2609adf5c6824c0a29fa7c47963 (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: Jiri Slaby <jslaby@suse.cz>
| -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 03146a15f4f9..198fd6e1f6d4 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2078,6 +2078,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) && |