From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E25EA3B1002 for ; Fri, 12 Jun 2026 13:36:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271418; cv=none; b=CzQWdasuLP2tcHAaqDJeUTBARKIQ4bOOZbwllYmYbOXaQ5up0AXBzoJh/2vbxxdB4HtHeqTOmSfBMJZUYzuSEhzFIE0WEgjQr3UQJ1JKp7v0pHWENGDa1e1b5Jv9fi4FCablUZd/2ABBcEEaUh00+rHeFH7iH6j/nPtBMdLhcX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781271418; c=relaxed/simple; bh=nCpdhIunvB06QiAzGtqEd5PSwXEXy/YkzxmjFScsVGs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZE5X2iU++n45Azh9QKWcEJO2aSVc85FOqomgQvqdVF25STtT1OOPNwRBRCNGj1dSeIclG+7JgJtxK/h5938er8HBjsWBFweywT6JQ+QzJkmBuUjmTk/BtVcmrIotvju5+PKo0rnRvUgdlIKEQvqG+KlQ87XmWzLPobsHd74+i28= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=o9aItiyr; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o9aItiyr" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2c0c1e0d00bso9021165ad.0 for ; Fri, 12 Jun 2026 06:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781271416; x=1781876216; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bGQjtNDHafVkCF72eksxJ6HFAyJPMwhm2V7Z5ULHxOY=; b=o9aItiyrbuRtCfRcg0NZcl29uhEuOtply9AZa1M04fp+uxFPXMhn3WiwLQotr0ryuL W1cD1OUYPjk592KEN6y+wcC/SkH6yaq4jm4ydJA902Kuw+pZTSq9iuu8ju3s/ez7S9kC JbgNWIt+QuK9dxo30BElj/YeXYYCMTKcUbaK02WlRLzhPRr3scQxOFiSnHm8pmYD27Rf 1kdd2r92FSwOKxISGFzdE7Y1RsmunzKuFWzJbQhtQO9+jRQh489WAemsErMt6IdEzp/F cCjMV8WHrfAU1mjyp5rYPqoOriCY5odUrOnxMi5m15/sgWNAXowrlOdVDI3BxDXFBS8W Assw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781271416; x=1781876216; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bGQjtNDHafVkCF72eksxJ6HFAyJPMwhm2V7Z5ULHxOY=; b=HVDHE+CqQ+KTxjg3/Ueb0umekIZK07LuWtLWmcPHPgvG3+NmK5s8gI0pi+vd+ZfQD7 zbEioWx+uF4TxDSP10kQR8X/Qf6g9LjZZi3sj6s+8Gb+AKsXHSSucJTfBOyDKczlkWMQ PVDnhonus+naV1ov5/Rmwg6aiwp5F9rNTmoXyY30yv125Y0QtGAkaHJ3Zr4VpzU/lr7a YM1iyNqfiwJaLPhyk4MJtG5/M3RgZvVeJyBGwXMM0Trtkd8PtVBFrCLP4LU2/jYu3YwF YU4AibYyllyoHa94n6l7Bx5OGezeUKeU2C5XUYtiHcZ1ctOZC+CgdqUEK300bZb54L+o n7cg== X-Forwarded-Encrypted: i=1; AFNElJ+jutj3YonYaVi2CvhBTjf+jJxcfF65OwfRot5/Q2d0H2WIPbmAcSE04nN3lsvx6skfi7mUf437MYK47oc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/XYL39z5RwBwchnRe+eXdV1527O4NstCQuh5i7o2trDoAbb6B CbAtmWpFZWy4E6E3AocypoW6/nl7T9ORLDzUEMLT5CTepOP2lFJfDHc5 X-Gm-Gg: Acq92OHPrmbMmnf0ffKBmW10RTdyv6em/aW4xoHy+E24jobtqfsAHMg2kC9x9/BkIBL T1Gecj0378Zh81VpHcHC9rbFpHdrZ2gGWJ3fQAMCjHwwJgAXjzEQArvco217f7hYaXfUuby176V f3TF18gh+EeZqRzb5t/+0a7dGbtCBdsu/xjo/5cdaexFbBGcFv8tbPe7vX+kZz2RAVf0KF5/P5o Hcngxp5JnuZXoY7kCMdA/h1gqDmYLfQO4Gyrhh5RB2nzc+bRnCLaZIkdL3M9+BxXEVZ+hFN+pWc TmRuC8BG9z+J/UOsm1PlbnFODL4Y8UIOvVrW9++kCr7mVtY4Q2EWhUCkvBkA4fsLI4de9Aiu3s7 d7XDMD7YKXeXFVt3T64nujgKYscKepXNTehsdQHNqXwmT8gnlQQgkp+jX8QGswZRcm8MUwQQatt dpLkY3UkrD5U1U7oCVFMp+C81hKJIVmWKAg2BzfvxymIcG2CXSgpoh7PYwlfP8mjI= X-Received: by 2002:a17:902:e750:b0:2c1:e04d:7cb5 with SMTP id d9443c01a7336-2c412841372mr35915755ad.34.1781271416371; Fri, 12 Jun 2026 06:36:56 -0700 (PDT) Received: from KRHW1CJW23.bytedance.net ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f2e59e1sm22777925ad.17.2026.06.12.06.36.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 12 Jun 2026 06:36:56 -0700 (PDT) From: Zhao Li To: Johannes Berg , Lachlan Hodges Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: mac80211: avoid non-S1G AID fallback for S1G assoc Date: Fri, 12 Jun 2026 21:36:50 +0800 Message-ID: <20260612133649.92630-2-enderaoelyther@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. 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 --- net/mac80211/mlme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index b98ddfa3003e1..e86adc0371994 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -6737,8 +6737,12 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, if (elems->aid_resp) aid = le16_to_cpu(elems->aid_resp->aid); - else + else if (!assoc_data->s1g) aid = le16_to_cpu(mgmt->u.assoc_resp.aid); + else if (status_code == WLAN_STATUS_SUCCESS) + goto abandon_assoc; + else + aid = 0; /* * The 5 MSB of the AID field are reserved for a non-S1G STA. For -- 2.50.1 (Apple Git-155)