diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:02:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:09:16 -0400 |
| commit | 11b7c60988e5fbabb4e150612931cc068559af16 (patch) | |
| tree | 533364fe997071c4cab3f1ff44dcd9e496c6f55e | |
| parent | dc1dfe47445d45b3076ea940dda8f46a4b96e386 (diff) | |
| download | linux-11b7c60988e5fbabb4e150612931cc068559af16.tar.gz linux-11b7c60988e5fbabb4e150612931cc068559af16.tar.bz2 linux-11b7c60988e5fbabb4e150612931cc068559af16.zip | |
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>
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 3623bb7c4bf4..9420cf14fae4 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. |