lkml.org 
[lkml]   [2015]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 51/78] mac80211: fix multicast LED blinking and counter
    Date
    From: Andreas Müller <goo@stapelspeicher.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit d025933e29872cb1fe19fc54d80e4dfa4ee5779c upstream.

    As multicast-frames can't be fragmented, "dot11MulticastReceivedFrameCount"
    stopped being incremented after the use-after-free fix. Furthermore, the
    RX-LED will be triggered by every multicast frame (which wouldn't happen
    before) which wouldn't allow the LED to rest at all.

    Fixes https://bugzilla.kernel.org/show_bug.cgi?id=89431 which also had the
    patch.

    Fixes: b8fff407a180 ("mac80211: fix use-after-free in defragmentation")
    Signed-off-by: Andreas Müller <goo@stapelspeicher.org>
    [rewrite commit message]
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    net/mac80211/rx.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
    index 275cb85bfa31..ef3bdba9309e 100644
    --- a/net/mac80211/rx.c
    +++ b/net/mac80211/rx.c
    @@ -1646,14 +1646,14 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
    sc = le16_to_cpu(hdr->seq_ctrl);
    frag = sc & IEEE80211_SCTL_FRAG;

    - if (likely(!ieee80211_has_morefrags(fc) && frag == 0))
    - goto out;
    -
    if (is_multicast_ether_addr(hdr->addr1)) {
    rx->local->dot11MulticastReceivedFrameCount++;
    - goto out;
    + goto out_no_led;
    }

    + if (likely(!ieee80211_has_morefrags(fc) && frag == 0))
    + goto out;
    +
    I802_DEBUG_INC(rx->local->rx_handlers_fragments);

    if (skb_linearize(rx->skb))
    @@ -1744,9 +1744,10 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
    status->rx_flags |= IEEE80211_RX_FRAGMENTED;

    out:
    + ieee80211_led_rx(rx->local);
    + out_no_led:
    if (rx->sta)
    rx->sta->rx_packets++;
    - ieee80211_led_rx(rx->local);
    return RX_CONTINUE;
    }

    --
    2.2.1


    \
     
     \ /
      Last update: 2015-01-09 12:01    [W:4.143 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site