diff options
| author | Bob Copeland <me@bobcopeland.com> | 2015-03-02 14:28:52 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-16 20:11:37 -0400 |
| commit | d78408c0288dce070487844ba2694cd8c1114437 (patch) | |
| tree | 70724b5ad50c1daec23af73798144683322dbc1b /net/mac80211 | |
| parent | 205124bc2c04af72db97957471959636dd88ef3c (diff) | |
| download | linux-stable-d78408c0288dce070487844ba2694cd8c1114437.tar.gz linux-stable-d78408c0288dce070487844ba2694cd8c1114437.tar.bz2 linux-stable-d78408c0288dce070487844ba2694cd8c1114437.zip | |
mac80211: drop unencrypted frames in mesh fwding
[ Upstream commit d0c22119f574b851e63360c6b8660fe9593bbc3c ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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 7d6379bd2cb8..bb77d6d7258a 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2108,6 +2108,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) && |