diff options
| author | Andreas Müller <goo@stapelspeicher.org> | 2014-12-12 12:11:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-08 10:27:47 -0800 |
| commit | 5f8057b67dd559a1b678b0aacf1e38d1e84b94ce (patch) | |
| tree | 7dde92a6032b32af5057f7ba3ed414599baf4948 | |
| parent | 10290dd37e6dc3c370a19b6cf3d7275d9abe962e (diff) | |
| download | linux-stable-5f8057b67dd559a1b678b0aacf1e38d1e84b94ce.tar.gz linux-stable-5f8057b67dd559a1b678b0aacf1e38d1e84b94ce.tar.bz2 linux-stable-5f8057b67dd559a1b678b0aacf1e38d1e84b94ce.zip | |
mac80211: fix multicast LED blinking and counter
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mac80211/rx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 7e77410ca799..fced06462b8c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1667,14 +1667,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)) @@ -1765,9 +1765,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; } |