diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2021-04-09 12:40:16 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-04-19 13:04:26 +0300 |
| commit | 253907ab8bc0818639af382f6398810fa1f022b3 (patch) | |
| tree | 24f22bdbffa7d9ee53b19519c3464514aa8d3abf /net/mac80211/mlme.c | |
| parent | f30386a85f695aced2fa5b124d65ce5a5f3dc3ac (diff) | |
| download | linux-253907ab8bc0818639af382f6398810fa1f022b3.tar.xz | |
mac80211: properly drop the connection in case of invalid CSA IE
In case the frequency is invalid, ieee80211_parse_ch_switch_ie
will fail and we may not even reach the check in
ieee80211_sta_process_chanswitch. Drop the connection
in case ieee80211_parse_ch_switch_ie failed, but still
take into account the CSA mode to remember not to send
a deauth frame in case if it is forbidden to.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210409123755.34712ef96a0a.I75d7ad7f1d654e8b0aa01cd7189ff00a510512b3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 5f89aae9ea23..36070a991df0 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1405,11 +1405,8 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, ch_switch.delay = csa_ie.max_switch_time; } - if (res < 0) { - ieee80211_queue_work(&local->hw, - &ifmgd->csa_connection_drop_work); - return; - } + if (res < 0) + goto lock_and_drop_connection; if (beacon && sdata->vif.csa_active && !ifmgd->csa_waiting_bcn) { if (res) |