Skip to contentSkip to conversation

mac80211: fix use-after-free

PATCH New Johannes Berg 1 participant 1 message Sep 24, 2010 mac80211

lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

PATCH 1/1 mac80211: fix use-after-free

From: Johannes Berg <[email protected]>

commit 8c0c709eea5cbab97fb464cd68b06f24acc58ee1

Author: Johannes Berg <[email protected]>
Date:   Wed Nov 25 17:46:15 2009 +0100

mac80211: move cmntr flag out of rx flags

moved the CMTR flag into the skb's status, and in doing so introduced a use-after-free -- when the skb has been handed to cooked monitors the status setting will touch now invalid memory.

Additionally, moving it there has effectively discarded the optimisation -- since the bit is only ever set on freed SKBs, and those were a copy, it could never be checked.

For the current release, fixing this properly is a bit too involved, so let's just remove the problematic code and leave userspace with one copy of each frame for each virtual interface.

---
NOTE: John, you either need to put this into wireless-2.6
and then merge that into wireless-next-2.6 and revert this patch before applying my other patchset, or there will be merge issues (which should be fairly simple, but I haven't tried) when you later merge wireless-2.6 into wireless-next-2.6 or this happens in linux-next.

 net/mac80211/rx.c |    4 ----
 1 file changed, 4 deletions(-)
net/mac80211/rx.c +0 -4
@@ -2199,9 +2199,6 @@ static void ieee80211_rx_cooked_monitor(
 	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;
@@ -2260,7 +2257,6 @@ static void ieee80211_rx_cooked_monitor(
 	} else
 		goto out_free_skb;
 
-	status->flag |= RX_FLAG_INTERNAL_CMTR;
 	return;
 
  out_free_skb: