Commit 01ad6b7b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: always initialize match_auth 



My previous patch only initialized match_auth when the
ifmgd->auth_data exists, but that was wrong, it should
always be set. Fix that.

Fixes: 310c8387 ("wifi: mac80211: clean up connection process")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/3151f5d0-c18f-413d-b34b-b94f095b947c@moroto.mountain


Reviewed-by: default avatarMiriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240301193633.1a3fc370f211.I979dd222b3b5eb5e1437886e5f7c2355eeccb9f7@changeid


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

net/mac80211/mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -8129,8 +8129,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	       sizeof(ifmgd->s1g_capa_mask));



	/* keep some setup (AP STA, channel, ...) if matching */

	if (ifmgd->auth_data)

		match_auth = ether_addr_equal(ifmgd->auth_data->ap_addr,

	match_auth = ifmgd->auth_data &&

		     ether_addr_equal(ifmgd->auth_data->ap_addr,

				      assoc_data->ap_addr) &&

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