Commit 2e6bd243 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: fix prep_connection error path 



If prep_channel fails in prep_connection, the code releases
the deflink's chanctx, which is wrong since we may be using
a different link. It's already wrong to even do that always
though, since we might still have the station. Remove it
only if prep_channel succeeded and later updates fail.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240318184907.2780c1f08c3d.I033c9b15483933088f32a2c0789612a33dd33d82@changeid


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

net/mac80211/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -7652,7 +7652,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, 
			sdata_info(sdata,

				   "failed to insert STA entry for the AP (error %d)\n",

				   err);

			goto out_err;

			goto out_release_chan;

		}

	} else

		WARN_ON_ONCE(!ether_addr_equal(link->u.mgd.bssid, cbss->bssid));
@@ -7663,8 +7663,9 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, 


	return 0;



out_release_chan:

	ieee80211_link_release_channel(link);

out_err:

	ieee80211_link_release_channel(&sdata->deflink);

	ieee80211_vif_set_links(sdata, 0, 0);

	return err;

}