From patchwork Sat Sep 21 06:33:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wang X-Patchwork-Id: 1988115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ROLKD9Bz; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PnlqHgqW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X9fbv0nZCz1xrD for ; Sat, 21 Sep 2024 16:34:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bM/0lvru8PJxSe4a+mdNqACP5zqeFXTsaEkqsIFvOuI=; b=ROLKD9BzJ65iNt 7mr3tG37+yrb3eoc69Xbt2NnMkT8HMAOTs6y5oVb3JO+MqSLrAzDV2bWYLEGdva2Bf+BAKTDbd/KW 5av9X9mLolOlJ32jy11UT15FdR5wK1DFlpmokTTiBlbpUT7XyEODf/rDWZ+e7Ai6jSHn0S+XK/yNP oKACi2RyruiJQCgTRA1jnuO6okrMsdEHUjz0Gl08JHpJlJg2l27GNwQfwJtAix1t/Vil8Yxb7jPyd ysjwFkoO2loCMsddgUK6PFr7elr3XdMrf23xfJ+/59UUHAnYIzlN47yY2OoTqaFvmQvYQtPDfq9vX jv9dA12XyYFp4aFHv08w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1srtgB-0000000DMuj-0mbG; Sat, 21 Sep 2024 06:33:15 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1srtg7-0000000DMuK-0aBB for hostap@lists.infradead.org; Sat, 21 Sep 2024 06:33:12 +0000 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42cae6bb895so25743105e9.1 for ; Fri, 20 Sep 2024 23:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1726900389; x=1727505189; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QYCRQPJT02VxM5HZ4rAZ9UO/6w3cZSWi0kgYgxvkrws=; b=PnlqHgqWIedE9sorD1fTU1BARwGIk/P6LVZpvdP/CeoVNVCjXmFi7uPMfZFG0DD6Vp p1f6av/Xj6m78GwlMgCti7zpdjt6EaAdFkux/c/s3urkH8nIpbbVM/MHYqrM4tLfDkNh JhBJP6Ee/CBQp94Xnw5y96owoWvnfs7qtXI9w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726900389; x=1727505189; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QYCRQPJT02VxM5HZ4rAZ9UO/6w3cZSWi0kgYgxvkrws=; b=Lx/ziPjhEmAr5Yi9EMmyZ0s5EGJ6V8bIoFThA3Eq80U8L8/+zJ/M0c5eYp4RcasgCV UrMnfKZxJMlwdRbbJQOEdEiPi6i505ck9b9LDQ874lDjcT6DsdG/mCVLsWOJKePNN6CK WDy6Xuc/c2uWK0RYcSgfQIV4wH25V5RE+z7TxvN0BKx5UkQlSIJDNNnIwqH6OpKH6xCH FpJOyIFQWZUH1jwHo3DTmcp9J0MxsicxdnN5gsUCYOPvz+yWswJgmOOWj+ma+ocjp0MQ tsV9Bx9Cw67P2JVqth1p0+Rrkaqt9QIE8ZGeNZx8dSsZBFIqajyqqGGW/AWy6KPFct7t coZw== X-Gm-Message-State: AOJu0Yx6Pyusric8MDpPG1A8t1eke9Z94iJun/LDxVXm0pKkANgfknZc TLiI2MYMimMP7EIfvEtYB9TX/DmLlZ8eparKi0vZf4pTa0yvdRqncx9x6d53+g== X-Google-Smtp-Source: AGHT+IHrEDrJY1xhMTh6WKT3g2jrdeAGLwjhmG8NDVnHFoeoiwTljqYZGmN65lYOkogeeu4HOgQZPQ== X-Received: by 2002:a05:600c:1c29:b0:42c:b55f:f7c with SMTP id 5b1f17b1804b1-42e7c16ec8emr32298415e9.15.1726900388449; Fri, 20 Sep 2024 23:33:08 -0700 (PDT) Received: from matthewmwangcros2.c.googlers.com.com (105.168.195.35.bc.googleusercontent.com. [35.195.168.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e78051c1sm19565095f8f.99.2024.09.20.23.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 23:33:07 -0700 (PDT) From: Matthew Wang X-Google-Original-From: Matthew Wang To: j@w1.fi Cc: hostap@lists.infradead.org, matthewmwang@chromium.org, Matthew Wang Subject: [PATCH] Filter MLD APs Date: Sat, 21 Sep 2024 06:33:03 +0000 Message-ID: <20240921063303.2369547-1-matthewmwang@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240920_233311_235388_4874C8D9 X-CRM114-Status: GOOD ( 11.51 ) X-Spam-Score: -2.1 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: MLD APs require MFPC and disallow PSK key managements. Signed-off-by: Matthew Wang --- wpa_supplicant/events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:329 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org MLD APs require MFPC and disallow PSK key managements. Signed-off-by: Matthew Wang --- wpa_supplicant/events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 90e1c7b9f..035b37888 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -744,16 +744,16 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s, break; } - if (is_6ghz_bss) { - /* MFPC must be supported on 6 GHz */ + if (is_6ghz_bss || !is_zero_ether_addr(bss->mld_addr)) { + /* MFPC must be supported on 6 GHz and MLD */ if (!(ie.capabilities & WPA_CAPABILITY_MFPC)) { if (debug_print) wpa_dbg(wpa_s, MSG_DEBUG, - " skip RSNE - 6 GHz without MFPC"); + " skip RSNE - 6 GHz/MLD without MFPC"); break; } - /* WPA PSK is not allowed on the 6 GHz band */ + /* WPA PSK is not allowed on the 6 GHz band or MLD */ ie.key_mgmt &= ~(WPA_KEY_MGMT_PSK | WPA_KEY_MGMT_FT_PSK | WPA_KEY_MGMT_PSK_SHA256);