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

Commit 2fec3d27 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Luciano Coelho
Browse files

wlcore: don't risk using stale HLID during .sta_state callback 



The HLID of a STA can change, particularly during recovery. Don't cache
the HLID before it was potentially allocated.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 37c68ea6

drivers/net/wireless/ti/wlcore/main.c

+2 −4
Original line number Diff line number Diff line
@@ -4620,13 +4620,11 @@ static int wl12xx_update_sta_state(struct wl1271 *wl, 
				   enum ieee80211_sta_state new_state)

{

	struct wl1271_station *wl_sta;

	u8 hlid;

	bool is_ap = wlvif->bss_type == BSS_TYPE_AP_BSS;

	bool is_sta = wlvif->bss_type == BSS_TYPE_STA_BSS;

	int ret;



	wl_sta = (struct wl1271_station *)sta->drv_priv;

	hlid = wl_sta->hlid;



	/* Add station (AP mode) */

	if (is_ap &&
@@ -4652,12 +4650,12 @@ static int wl12xx_update_sta_state(struct wl1271 *wl, 
	/* Authorize station (AP mode) */

	if (is_ap &&

	    new_state == IEEE80211_STA_AUTHORIZED) {

		ret = wl12xx_cmd_set_peer_state(wl, wlvif, hlid);

		ret = wl12xx_cmd_set_peer_state(wl, wlvif, wl_sta->hlid);

		if (ret < 0)

			return ret;



		ret = wl1271_acx_set_ht_capabilities(wl, &sta->ht_cap, true,

						     hlid);

						     wl_sta->hlid);

		if (ret)

			return ret;