diff options
| author | Javier Cardona <javier@cozybit.com> | 2012-10-24 12:43:30 -0700 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-19 10:21:23 +0100 |
| commit | c1c846e6037d7d05ef544b886cd05c46d43a30a2 (patch) | |
| tree | dd1cce6bdcaa582df0768afa5a4ad09776ac00c1 /net/mac80211 | |
| parent | 8da039a46bb2ae1c0a667c1b1537aafed4f21f2b (diff) | |
mac80211: Only process mesh config header on frames that RA_MATCH
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 <Chaoxing.Lin@ultra-3eti.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 99578109208b..4563e1a3c1ad 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1900,7 +1900,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 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 ieee80211_rx_data *rx) } 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; |