[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1434443826-4929-97-git-send-email-lizf@kernel.org>
Date: Tue, 16 Jun 2015 16:35:51 +0800
From: lizf@...nel.org
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Bob Copeland <me@...copeland.com>,
Johannes Berg <johannes.berg@...el.com>,
Zefan Li <lizefan@...wei.com>
Subject: [PATCH 3.4 097/172] mac80211: drop unencrypted frames in mesh fwding
From: Bob Copeland <me@...copeland.com>
3.4.108-rc1 review patch. If anyone has any objections, please let me know.
------------------
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@...solutions.net>
Signed-off-by: Bob Copeland <me@...copeland.com>
Signed-off-by: Johannes Berg <johannes.berg@...el.com>
Signed-off-by: Zefan Li <lizefan@...wei.com>
---
net/mac80211/rx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 24f2a41..dcd632f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1926,6 +1926,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) &&
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists