From patchwork Tue Feb 20 13:18:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 1901481 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=q1KvZnzX; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=sipsolutions.net header.i=@sipsolutions.net header.a=rsa-sha256 header.s=mail header.b=RnELpPuK; 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 4TfKlZ4Jblz20Qg for ; Wed, 21 Feb 2024 00:20:26 +1100 (AEDT) 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:References:In-Reply-To: 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: List-Owner; bh=rmgPzN1GA9t+zIdg79GLA1hRbHynpNdlsQrmT9KVBFM=; b=q1KvZnzXM/3THd BoC+I3Td6B+C/vohLVMMECOBuwB9jd73AXw/a6I8Upv7niaDCQmxZQuW78Ow5xnTEmVYrPSKXIU8m hSz7nmoRso43KaW2Y+fz29kwgPHoLCsUYWdXq/h3nwiRxgAK7kOQtykzh3rj9gM5ZRk0S+30EdSb6 DAoChBk7zPrrNUWgOxmW79hIIcjsLem0hvlPJHNuIJ3LRV0OmpIEqNZEJuJP+fBnyOtIKXLBs4BIj 79m9wcfXd+GQaZDbmfNWvu4gvtix84TyhqLt8y/xJEvIrWl9tZ/0U0wiCuTedm4xp8eaebq63meid zuiD1tnzEYYidzsuWEww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcQ2Z-0000000EprS-3Xc2; Tue, 20 Feb 2024 13:20:07 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:242:246e::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcQ1d-0000000Ep5C-0sPL for hostap@lists.infradead.org; Tue, 20 Feb 2024 13:19:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=DNesWWrNxslmfCfduxQHoGnsIwu78cymZ6imaCRQF7Y=; t=1708435149; x=1709644749; b=RnELpPuK38FbnuMXHjGii+EKug6WL8nc092Y76fgJULf/O6 BZPYfmbN9LBYfNCy1v0aedpWx3nKZxqw2HvtqNL6ewJaeTJVtOyQaxkJphFJikaXrmAX97vGDu95S WFuTqyETxyEzxGGDVwX/QAOB4M+YVgYxOA08isYZbDTTuQxenR0YHCwalRHi7eSHFQs+QczrY+PhU p3WSfG474SD9F8kytGtW2h+BQdaogrJmaBYVIw69L8mlTD+DDX2wb3JPIN71f+D89GmRI2/aTuFBF ZVqixH++/LFXbPx2RKXArNXfL1AnZwcwaUpIjAPXFlqhj12wB5e6S85h3vjgg+Bg==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.97) (envelope-from ) id 1rcQ1b-00000000ugq-0pQK; Tue, 20 Feb 2024 14:19:07 +0100 From: benjamin@sipsolutions.net To: hostap@lists.infradead.org Cc: Benjamin Berg Subject: [PATCH v2 14/20] WNM: Drop explicit SSID check Date: Tue, 20 Feb 2024 14:18:21 +0100 Message-ID: <20240220131827.17766-15-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220131827.17766-1-benjamin@sipsolutions.net> References: <20240220131827.17766-1-benjamin@sipsolutions.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240220_051909_382951_EADA94DF X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) 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: From: Benjamin Berg The call to wpa_scan_res_match already checks that the SSID matches current_ssid. Therefore there is no need to do any further checking. Signed-off-by: Benjamin Berg --- wpa_supplicant/wnm_sta.c | 18 ++++ 1 file changed, 4 insertions(+), 14 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -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_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. 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 From: Benjamin Berg The call to wpa_scan_res_match already checks that the SSID matches current_ssid. Therefore there is no need to do any further checking. Signed-off-by: Benjamin Berg --- wpa_supplicant/wnm_sta.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index 199d7985c..2ba78377a 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -781,20 +781,10 @@ compare_scan_neighbor_results(struct wpa_supplicant *wpa_s, os_time_t age_secs, } } - if (bss->ssid_len != target->ssid_len || - os_memcmp(bss->ssid, target->ssid, bss->ssid_len) != 0) { - /* - * TODO: Could consider allowing transition to another - * ESS if PMF was enabled for the association. - */ - wpa_printf(MSG_DEBUG, "Candidate BSS " MACSTR - " (pref %d) in different ESS", - MAC2STR(nei->bssid), - nei->preference_present ? nei->preference : - -1); - continue; - } - + /* + * TODO: Could consider allowing transition to another ESS if + * PMF was enabled for the association. + */ if (!wpa_scan_res_match(wpa_s, 0, target, wpa_s->current_ssid, 1, 0)) { wpa_printf(MSG_DEBUG, "Candidate BSS " MACSTR