Commit 6b398f1c authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: mac80211: cleanup auth_data only if association continues 



If the association command fails then the authentication is still valid
and it makes sense to keep it alive. Otherwise, we would currently get
into an inconsistent state because mac80211 on the one hand is
disconnected but on the other hand the state is not entirely cleared
and a new authentication could not continue.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230928172905.c9855f46ebc8.I7f3dcd4120a186484a91b87560e9b7201d40984f@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7dbbf557

net/mac80211/mlme.c

+13 −4
Original line number Diff line number Diff line
@@ -7718,7 +7718,10 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
		match = ether_addr_equal(ifmgd->auth_data->ap_addr,

					 assoc_data->ap_addr) &&

			ifmgd->auth_data->link_id == req->link_id;

		ieee80211_destroy_auth_data(sdata, match);



		/* Cleanup is delayed if auth_data matches */

		if (!match)

			ieee80211_destroy_auth_data(sdata, false);

	}



	/* prepare assoc data */
@@ -7941,11 +7944,17 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 


	run_again(sdata, assoc_data->timeout);



	/* We are associating, clean up auth_data */

	if (ifmgd->auth_data)

		ieee80211_destroy_auth_data(sdata, true);



	return 0;

 err_clear:

	if (!ifmgd->auth_data) {

		eth_zero_addr(sdata->deflink.u.mgd.bssid);

		ieee80211_link_info_change_notify(sdata, &sdata->deflink,

						  BSS_CHANGED_BSSID);

	}

	ifmgd->assoc_data = NULL;

 err_free:

	kfree(assoc_data);