Skip to content

Commit 1527ab7

Browse files
jmberg-intelgregkh
authored andcommitted
mac80211: always wind down STA state
commit dcd479e upstream. When (for example) an IBSS station is pre-moved to AUTHORIZED before it's inserted, and then the insertion fails, we don't clean up the fast RX/TX states that might already have been created, since we don't go through all the state transitions again on the way down. Do that, if it hasn't been done already, when the station is freed. I considered only freeing the fast TX/RX state there, but we might add more state so it's more robust to wind down the state properly. Note that we warn if the station was ever inserted, it should have been properly cleaned up in that case, and the driver will probably not like things happening out of order. Reported-by: syzbot+2e293dbd67de2836ba42@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/20201009141710.7223b322a955.I95bd08b9ad0e039c034927cce0b75beea38e059b@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent df33054 commit 1527ab7

1 file changed

Lines changed: 18 additions & 0 deletions

File tree

net/mac80211/sta_info.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
244244
*/
245245
void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
246246
{
247+
/*
248+
* If we had used sta_info_pre_move_state() then we might not
249+
* have gone through the state transitions down again, so do
250+
* it here now (and warn if it's inserted).
251+
*
252+
* This will clear state such as fast TX/RX that may have been
253+
* allocated during state transitions.
254+
*/
255+
while (sta->sta_state > IEEE80211_STA_NONE) {
256+
int ret;
257+
258+
WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));
259+
260+
ret = sta_info_move_state(sta, sta->sta_state - 1);
261+
if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))
262+
break;
263+
}
264+
247265
if (sta->rate_ctrl)
248266
rate_control_free_sta(sta);
249267

0 commit comments

Comments
 (0)