Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 345f6b8b authored by Daniel Drake's avatar Daniel Drake Committed by John W. Linville
Browse files

[PATCH] softmac: do shared key auth in workqueue 



Johann Uhrmann reported a bcm43xx crash and Michael Buesch tracked
it down to a problem with the new shared key auth code (recursive
calls into the driver)

This patch (effectively Michael's patch with a couple of small
modifications) solves the problem by sending the authentication
challenge response frame from a workqueue entry.

I also removed a lone \n from the bcm43xx messages relating to
authentication mode - this small change was previously discussed but
not patched in.

Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8fa9ea18

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, 
	}

	if (sec->flags & SEC_AUTH_MODE) {

		secinfo->auth_mode = sec->auth_mode;

		dprintk(", .auth_mode = %d\n", sec->auth_mode);

		dprintk(", .auth_mode = %d", sec->auth_mode);

	}

	dprintk("\n");

	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&

net/ieee80211/softmac/ieee80211softmac_auth.c

+22 −6
Original line number Diff line number Diff line
@@ -116,6 +116,16 @@ ieee80211softmac_auth_queue(void *data) 
	kfree(auth);

}



/* Sends a response to an auth challenge (for shared key auth). */

static void

ieee80211softmac_auth_challenge_response(void *_aq)

{

	struct ieee80211softmac_auth_queue_item *aq = _aq;



	/* Send our response */

	ieee80211softmac_send_mgt_frame(aq->mac, aq->net, IEEE80211_STYPE_AUTH, aq->state);

}



/* Handle the auth response from the AP

 * This should be registered with ieee80211 as handle_auth 

 */
@@ -211,10 +221,16 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth) 
			net->challenge = kmalloc(net->challenge_len, GFP_ATOMIC);

			memcpy(net->challenge, data, net->challenge_len);

			aq->state = IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE; 

			spin_unlock_irqrestore(&mac->lock, flags);



			/* Send our response */

			ieee80211softmac_send_mgt_frame(mac, aq->net, IEEE80211_STYPE_AUTH, aq->state);

			/* We reuse the work struct from the auth request here.

			 * It is safe to do so as each one is per-request, and

			 * at this point (dealing with authentication response)

			 * we have obviously already sent the initial auth

			 * request. */

			cancel_delayed_work(&aq->work);

			INIT_WORK(&aq->work, &ieee80211softmac_auth_challenge_response, (void *)aq);

			schedule_work(&aq->work);

			spin_unlock_irqrestore(&mac->lock, flags);

			return 0;

		case IEEE80211SOFTMAC_AUTH_SHARED_PASS:

			kfree(net->challenge);