diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-03-02 14:28:52 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-13 14:03:52 +0200 |
| commit | d22db2725c02cc7cf374077d0fc130cf69e7a0cf (patch) | |
| tree | 6343d1725aa3cf16abe87c36daa61089671f6174 | |
| parent | 0bb81d514fbc6e1e2a68eb611b9cad7706f54546 (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 d69ca513848e..b448e8ff3213 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2191,6 +2191,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) && |