Commit 7c1e1831 authored by John W. Linville's avatar John W. Linville
Browse files

Revert "mac80211: fix use-after-free"

This reverts commit cd87a2d3

.

Author reports it conflicts with proper fixes, applied hereafter.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 92e44948
......@@ -2286,6 +2286,9 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
struct net_device *prev_dev = NULL;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
if (status->flag & RX_FLAG_INTERNAL_CMTR)
goto out_free_skb;
if (skb_headroom(skb) < sizeof(*rthdr) &&
pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC))
goto out_free_skb;
......@@ -2344,6 +2347,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,
} else
goto out_free_skb;
status->flag |= RX_FLAG_INTERNAL_CMTR;
return;
out_free_skb:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment