lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 24/52] mac80211: fix miscounting of ttl-dropped frames
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit a0dc02039a2ee54fb4ae400e0b755ed30e73e58c ]

    In ieee80211_rx_h_mesh_fwding, we increment the 'dropped_frames_ttl'
    counter when we decrement the ttl to zero. For unicast frames
    destined for other hosts, we stop processing the frame at that point.

    For multicast frames, we do not rebroadcast it in this case, but we
    do pass the frame up the stack to process it on this STA. That
    doesn't match the usual definition of "dropped," so don't count
    those as such.

    With this change, something like `ping6 -i0.2 ff02::1%mesh0` from a
    peer in a ttl=1 network no longer increments the counter rapidly.

    Signed-off-by: Bob Copeland <bobcopeland@fb.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/rx.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
    index c7ac1a480b1dd..dfc2af6833aff 100644
    --- a/net/mac80211/rx.c
    +++ b/net/mac80211/rx.c
    @@ -2533,7 +2533,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
    skb_set_queue_mapping(skb, q);

    if (!--mesh_hdr->ttl) {
    - IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);
    + if (!is_multicast_ether_addr(hdr->addr1))
    + IEEE80211_IFSTA_MESH_CTR_INC(ifmsh,
    + dropped_frames_ttl);
    goto out;
    }

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-04 09:47    [W:4.034 / U:0.644 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site