Commit d0014901 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman

staging: wfx: fix RCU usage

Indeed, sta was used after call to rcu_unlock()
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-49-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76b5c2ce
...@@ -690,10 +690,9 @@ static void wfx_join_finalize(struct wfx_vif *wvif, ...@@ -690,10 +690,9 @@ static void wfx_join_finalize(struct wfx_vif *wvif,
struct ieee80211_sta *sta = NULL; struct ieee80211_sta *sta = NULL;
wvif->beacon_int = info->beacon_int; wvif->beacon_int = info->beacon_int;
rcu_read_lock(); rcu_read_lock(); // protect sta
if (info->bssid && !info->ibss_joined) if (info->bssid && !info->ibss_joined)
sta = ieee80211_find_sta(wvif->vif, info->bssid); sta = ieee80211_find_sta(wvif->vif, info->bssid);
rcu_read_unlock();
if (sta) if (sta)
wvif->bss_params.operational_rate_set = wvif->bss_params.operational_rate_set =
wfx_rate_mask_to_hw(wvif->wdev, sta->supp_rates[wvif->channel->band]); wfx_rate_mask_to_hw(wvif->wdev, sta->supp_rates[wvif->channel->band]);
...@@ -712,6 +711,7 @@ static void wfx_join_finalize(struct wfx_vif *wvif, ...@@ -712,6 +711,7 @@ static void wfx_join_finalize(struct wfx_vif *wvif,
wvif->bss_params.aid = info->aid; wvif->bss_params.aid = info->aid;
hif_set_association_mode(wvif, info, sta ? &sta->ht_cap : NULL); hif_set_association_mode(wvif, info, sta ? &sta->ht_cap : NULL);
rcu_read_unlock();
if (!info->ibss_joined) { if (!info->ibss_joined) {
hif_keep_alive_period(wvif, 30 /* sec */); hif_keep_alive_period(wvif, 30 /* sec */);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment