diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-03-02 14:28:52 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-03 09:27:28 +0100 |
| commit | d0c22119f574b851e63360c6b8660fe9593bbc3c (patch) | |
| tree | 14e23a76459bf819913ed941f2e0c4f39ad1a118 /net | |
| parent | 9c1c98a3bb7b7593b60264b9a07e001e68b46697 (diff) | |
| download | linux-d0c22119f574b851e63360c6b8660fe9593bbc3c.tar.bz2 | |
mac80211: drop unencrypted frames in mesh fwding
The mesh forwarding path was not checking that data
frames were protected when running an encrypted network;
add the necessary check.
Cc: stable@vger.kernel.org
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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 1101563357ea..944bdc04e913 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2214,6 +2214,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) && |