From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 7 Jun 2010 19:02:17 +0000 (-0400)
Subject: mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET
X-Git-Tag: v2.6.36-rc1~571^2~107^2~311
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11b7c60988e5fbabb4e150612931cc068559af16;p=platform%2Fkernel%2Flinux-3.10.git

mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET

"mac80211: make ARP filtering depend on CONFIG_INET" introduced this
potential locking leak.

Reported-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 3623bb7..9420cf1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2078,10 +2078,9 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
 			cfg80211_send_assoc_timeout(wk->sdata->dev,
 						    wk->filter_ta);
 			return WORK_DONE_DESTROY;
-#ifdef CONFIG_INET
 		} else {
 			mutex_unlock(&wk->sdata->u.mgd.mtx);
-
+#ifdef CONFIG_INET
 			/*
 			 * configure ARP filter IP addresses to the driver,
 			 * intentionally outside the mgd mutex.