[MAC80211]: avoid copying packets to interfaces that are down

David Woodhouse noticed that under some circumstances the number of slab
allocations kept growing. After looking a bit, this seemed to happen
when you had a management mode interface that was *down*.

The reason for this is that when the device is down, all management
frames get queued to the in-kernel MLME (via ieee80211_sta_rx_mgmt) but
then the sta work is invoked but doesn't run when the netif is down.
When you then bring the interface up, all such frames are freed, but if
you change the mode all of them are lost because the skb queue is
reinitialised as soon as you go back to managed mode. The skb queue is
correctly cleared when the interface is brought down, but the code
doesn't account for the fact that it may be filled while it is not up.

This patch should fix the issue by simply ignoring all interfaces that
are down when going through the RX handlers.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 5fc240259f55c8e85b42038edbc4ae6e47b1f327..00df2a9a26616962eded6a43702b87bce077fe55 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -493,7 +493,16 @@ static void ieee80211_if_shutdown(struct net_device *dev)
        case IEEE80211_IF_TYPE_IBSS:
                sdata->u.sta.state = IEEE80211_DISABLED;
                del_timer_sync(&sdata->u.sta.timer);
+               /*
+                * Holding the sub_if_lock for writing here blocks
+                * out the receive path and makes sure it's not
+                * currently processing a packet that may get
+                * added to the queue.
+                */
+               write_lock_bh(&local->sub_if_lock);
                skb_queue_purge(&sdata->u.sta.skb_queue);
+               write_unlock_bh(&local->sub_if_lock);
+
                if (!local->ops->hw_scan &&
                    local->scan_dev == sdata->dev) {
                        local->sta_scanning = 0;

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 95a00eb572499142492c4be38883cc5dbfb72710..01176ba52df467e96eea055af4d7b344325b0eb5 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1380,6 +1380,9 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
        list_for_each_entry(sdata, &local->sub_if_list, list) {
                rx.u.rx.ra_match = 1;
 
+               if (!netif_running(sdata->dev))
+                       continue;
+
                prepres = prepare_for_handlers(sdata, bssid, &rx, hdr);
                /* prepare_for_handlers can change sta */
                sta = rx.sta;