lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 006/241] mac80211: Only process mesh config header on frames that RA_MATCH
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Javier Cardona <javier@cozybit.com>

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    net/mac80211/rx.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
    index 965e6ec..33c49d5 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;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 16:21    [W:4.141 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site