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

Commit 0e2f6e3f authored by Hamad Kadmany's avatar Hamad Kadmany Committed by Maya Erez
Browse files

wil6210: Fix protection against connections during reset 



Existing code that ignores connection events during
reset flow will never take effect since it locks the
same mutex taken by the reset flow.

In addition, in case of unsolicited disconnect events ignore
those as well since device is about to get reset.

Change-Id: I132040822b8c1b3d1d92965d578ed5bee0b3d1cf
Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 105dd0f1

drivers/net/wireless/ath/wil6210/wmi.c

+9 −2
Original line number Diff line number Diff line
@@ -519,16 +519,16 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) 
		assoc_resp_ielen = 0;

	}



	mutex_lock(&wil->mutex);

	if (test_bit(wil_status_resetting, wil->status) ||

	    !test_bit(wil_status_fwready, wil->status)) {

		wil_err(wil, "status_resetting, cancel connect event, CID %d\n",

			evt->cid);

		mutex_unlock(&wil->mutex);

		/* no need for cleanup, wil_reset will do that */

		return;

	}



	mutex_lock(&wil->mutex);



	if ((wdev->iftype == NL80211_IFTYPE_STATION) ||

	    (wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) {

		if (!test_bit(wil_status_fwconnecting, wil->status)) {
@@ -632,6 +632,13 @@ static void wmi_evt_disconnect(struct wil6210_priv *wil, int id, 


	wil->sinfo_gen++;



	if (test_bit(wil_status_resetting, wil->status) ||

	    !test_bit(wil_status_fwready, wil->status)) {

		wil_err(wil, "status_resetting, cancel disconnect event\n");

		/* no need for cleanup, wil_reset will do that */

		return;

	}



	mutex_lock(&wil->mutex);

	wil6210_disconnect(wil, evt->bssid, reason_code, true);

	mutex_unlock(&wil->mutex);