From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: Jouni Malinen <j@w1.fi>, linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] cfg80211: fix more bugs in mlme handling
Date: Sat, 11 Jul 2009 00:17:32 +0200 [thread overview]
Message-ID: <1247264252.26071.3.camel@johannes.local> (raw)
The "what-was-I-thinking-if-anything" patch. Clearly,
if cfg80211_send_disassoc() does wdev_lock() and then
calls __cfg80211_send_disassoc(), the latter shouldn't
lock again. And the sme_state test is ... no further
comments.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/wireless/mlme.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- wireless-testing.orig/net/wireless/mlme.c 2009-07-11 00:13:50.000000000 +0200
+++ wireless-testing/net/wireless/mlme.c 2009-07-11 00:14:15.000000000 +0200
@@ -178,12 +178,12 @@ static void __cfg80211_send_disassoc(str
bool from_ap;
bool done = false;
- wdev_lock(wdev);
+ ASSERT_WDEV_LOCK(wdev);
nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL);
- if (!wdev->sme_state == CFG80211_SME_CONNECTED)
- goto out;
+ if (wdev->sme_state != CFG80211_SME_CONNECTED)
+ return;
if (wdev->current_bss &&
memcmp(wdev->current_bss, bssid, ETH_ALEN) == 0) {
@@ -205,8 +205,6 @@ static void __cfg80211_send_disassoc(str
from_ap = memcmp(mgmt->da, dev->dev_addr, ETH_ALEN) == 0;
__cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
- out:
- wdev_unlock(wdev);
}
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len,
reply other threads:[~2009-07-10 22:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1247264252.26071.3.camel@johannes.local \
--to=johannes@sipsolutions.net \
--cc=j@w1.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox