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 /net/mac80211/mlme.c | |
parent | dc1dfe47445d45b3076ea940dda8f46a4b96e386 (diff) |
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>
Diffstat (limited to 'net/mac80211/mlme.c')
-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, | |||
2078 | cfg80211_send_assoc_timeout(wk->sdata->dev, | 2078 | cfg80211_send_assoc_timeout(wk->sdata->dev, |
2079 | wk->filter_ta); | 2079 | wk->filter_ta); |
2080 | return WORK_DONE_DESTROY; | 2080 | return WORK_DONE_DESTROY; |
2081 | #ifdef CONFIG_INET | ||
2082 | } else { | 2081 | } else { |
2083 | mutex_unlock(&wk->sdata->u.mgd.mtx); | 2082 | mutex_unlock(&wk->sdata->u.mgd.mtx); |
2084 | 2083 | #ifdef CONFIG_INET | |
2085 | /* | 2084 | /* |
2086 | * configure ARP filter IP addresses to the driver, | 2085 | * configure ARP filter IP addresses to the driver, |
2087 | * intentionally outside the mgd mutex. | 2086 | * intentionally outside the mgd mutex. |