[ 14/57] mac80211: Only process mesh config header on frames that RA_MATCH
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-15 04:24:40
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Javier Cardona <redacted> commit 555cb715be8ef98b8ec362b23dfc254d432a35b1 upstream. Doing otherwise is wrong, and may wreak havoc on the mpp tables, specially if the frame is encrypted. Reported-by: Chaoxing Lin <redacted> Signed-off-by: Javier Cardona <redacted> Signed-off-by: Johannes Berg <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/mac80211/rx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c@@ -1900,7 +1900,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80 mesh_rmc_check(hdr->addr3, mesh_hdr, rx->sdata)) return RX_DROP_MONITOR; - if (!ieee80211_is_data(hdr->frame_control)) + if (!ieee80211_is_data(hdr->frame_control) || + !(status->rx_flags & IEEE80211_RX_RA_MATCH)) return RX_CONTINUE; if (!mesh_hdr->ttl)
@@ -1944,9 +1945,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80 } skb_set_queue_mapping(skb, q); - if (!(status->rx_flags & IEEE80211_RX_RA_MATCH)) - goto out; - if (!--mesh_hdr->ttl) { IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl); return RX_DROP_MONITOR;