]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
wifi: mac80211: avoid non-S1G AID fallback for S1G assoc
authorZhao Li <enderaoelyther@gmail.com>
Fri, 12 Jun 2026 15:24:41 +0000 (23:24 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 6 Jul 2026 12:11:10 +0000 (14:11 +0200)
commit035ed430ce6a2c35b01e211844a9f0a7643e57a4
tree50e30efc638826b522f72e0d59a584cdb79e53c2
parent57c05ce14fea03df01288fe1250f49197e161710
wifi: mac80211: avoid non-S1G AID fallback for S1G assoc

When assoc_data->s1g is set and no AID Response element is present,
falling back to mgmt->u.assoc_resp.aid reads the non-S1G
association-response layout.

Keep the fallback for non-S1G only. If a successful S1G association
response omits the AID Response element, abandon the association
instead of proceeding with AID 0. Initialize aid to 0 for other S1G
responses so the later mask and logging flow keeps a defined value
without reading the non-S1G layout.

Fixes: 2a8a6b7c4cb0 ("wifi: mac80211: handle station association response with S1G")
Assisted-by: Codex:gpt-5.5
Assisted-by: Claude:claude-opus-4.8
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
Link: https://patch.msgid.link/20260612152440.25955-2-enderaoelyther@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c