From patchwork Tue Feb 4 00:32:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wang X-Patchwork-Id: 1233074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=Jkl2Ymar; 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=myX6mdo5; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48BQdx3kdRz9sVw for ; Tue, 4 Feb 2020 11:33:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=lHfxuUwBfPzFi052hygkxb4cx196sDupfX3b2+SOhVM=; b=Jkl2YmarkYP5v+ yg6JDJHzzdhJshJsGfHfrryf1RbyDVq158S+ljJE9Ws+cObyPTmzJ6niyECk/mMd/vwKm7e/pv8hx 1YrBRZHwg36+VNckj5Duv50QIKhhdJ+inV4akvylu5pXWpN9QIik/1oqdUWZEwnk+ZpLCEuWyj2M3 LXuyiBRvVZYBpXGr0VgciVRWM0knC4oYtmpxmP3plZQVmZfOAvA0z3/CRWvPz9aUiNvoQEW0Uyhka XR8cW4orXxt077pisqLPwgBn7ClJ/rGeGOVSz+4RsRBx57EEckm+aN1bg9vnlHIEYtxBrEbuitvjP 2muDS1ra1Ekz7V79g6VQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iym9D-0004NF-RQ; Tue, 04 Feb 2020 00:32:59 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iym99-0004MD-N9 for hostap@lists.infradead.org; Tue, 04 Feb 2020 00:32:57 +0000 Received: by mail-pf1-x442.google.com with SMTP id j9so5417487pfa.8 for ; Mon, 03 Feb 2020 16:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sgGd3cdmKPSZJFP5shHzxqLipu9C2gGX4kcGbg34C3k=; b=myX6mdo5nmvIKR9AFn/XQhs3CD4ayYM5942IdwMoB3UCuIyrYMXDC/NwPsUjMWnqg3 +tzd42XZksSl94yB3BT99S8iYUznMh2wCW/a3S2hKpkcF0l90ZRlEMO+2wV7TOdWHGwT 9KA84sd+4Aka/jw3Ap8AOgYuy6ozKIoaAELPM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=sgGd3cdmKPSZJFP5shHzxqLipu9C2gGX4kcGbg34C3k=; b=LH1WB5XyAl6PBjiD6NV1KldRz+96NKLack7uIOc9UsDMfDyEKmgW875fcVOyrEumRQ F3/nEZz7vj+q+JbcVDSIIIDgF4pnxEKRbcqxe0fbIRu0fMc4i+JK3uULepqrduFRbsvV 6uEXdmAmXUqGFEY/3rhTbgjVRcpPoOyy4cs+ypt8ZP/pZcjVm5vewmOGSjbpocjDpKu/ 8RuAnMeobr64oFbLA05B/EcqouK5XgmE+cvrRc8g333p7a6r7EAxs5jRlKnepk2GaRyp +bolY2A2HPGlGu6tQD9SKxaXUioV7j/x7NLSOgf0OhAeZmTVcIoakWGDhQybvmaILcGV oMkg== X-Gm-Message-State: APjAAAX3KuGN/ih5II+i06Sl0Og4gmZLxtm05n6F/ykauJL0VkbFXAoO oqrxfBXNAc7CDg9DC5kvQG6sZPRRI3w= X-Google-Smtp-Source: APXvYqwYYRDo2WVC7vLsX+lOo89ExRLYx42IbY6AlDCbUwmKGt/b0D/nvftR6gBzZoozsOMb16CCTA== X-Received: by 2002:a62:7c49:: with SMTP id x70mr26323621pfc.200.1580776374076; Mon, 03 Feb 2020 16:32:54 -0800 (PST) Received: from localhost ([2620:15c:202:201:2b10:8627:31e7:c5ec]) by smtp.gmail.com with ESMTPSA id t11sm628440pjo.21.2020.02.03.16.32.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Feb 2020 16:32:53 -0800 (PST) From: Matthew Wang To: j@w1.fi Subject: [PATCH] check for FT support when selecting FT suites Date: Mon, 3 Feb 2020 16:32:46 -0800 Message-Id: <20200204003246.254840-1-matthewmwang@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200203_163255_780826_97F89088 X-CRM114-Status: GOOD ( 12.75 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hostap@lists.infradead.org, Matthew Wang Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org A driver supports FT if it either supports SME or the NL80211_CMD_UPDATE_FT_IES command. When selecting AKM suites, wpa_supplicant currently doesn't take into account whether or not either of those conditions are met. This can cause association failures e.g. when an AP supports both WPA-EAP and FT-EAP but the driver doesn't support FT (supplicant will decide to do FT-EAP since it is unaware the driver doesn't support it). This change allows an FT suite to be selected only when the driver also supports FT. Signed-off-by: Matthew Wang Reviewed-by: Brian Norris --- src/drivers/driver.h | 2 ++ src/drivers/driver_nl80211_capa.c | 7 +++++++ wpa_supplicant/wpa_supplicant.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 9bdf88011..601b3e24c 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1823,6 +1823,8 @@ struct wpa_driver_capa { #define WPA_DRIVER_FLAGS_CONTROL_PORT 0x0400000000000000ULL /** Driver supports VLAN offload */ #define WPA_DRIVER_FLAGS_VLAN_OFFLOAD 0x0800000000000000ULL +/** Driver supports UPDATE_FT_IES command */ +#define WPA_DRIVER_FLAGS_UPDATE_FT_IES 0x2000000000000000ULL u64 flags; #define FULL_AP_CLIENT_STATE_SUPP(drv_flags) \ diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c index 31e7cbfe5..6968e8e2a 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -78,6 +78,7 @@ struct wiphy_info_data { unsigned int wmm_ac_supported:1; unsigned int mac_addr_rand_scan_supported:1; unsigned int mac_addr_rand_sched_scan_supported:1; + unsigned int update_ft_ies_supported:1; }; @@ -243,6 +244,9 @@ static void wiphy_info_supp_cmds(struct wiphy_info_data *info, case NL80211_CMD_SET_QOS_MAP: info->set_qos_map_supported = 1; break; + case NL80211_CMD_UPDATE_FT_IES: + info->update_ft_ies_supported = 1; + break; } } } @@ -912,6 +916,9 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv, drv->capa.max_sched_scan_plan_iterations = 0; } + if (info->update_ft_ies_supported) + drv->capa.flags |= WPA_DRIVER_FLAGS_UPDATE_FT_IES; + return 0; } diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index aa7e1d09a..911727e05 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1458,6 +1458,10 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE)) sel &= ~(WPA_KEY_MGMT_SAE | WPA_KEY_MGMT_FT_SAE); #endif /* CONFIG_SAE */ +#ifdef CONFIG_IEEE80211R + if (!(wpa_s->drv_flags & (WPA_DRIVER_FLAGS_SME | WPA_DRIVER_FLAGS_UPDATE_FT_IES))) + sel &= ~WPA_KEY_MGMT_FT; +#endif /* CONFIG_IEEE80211R */ if (0) { #ifdef CONFIG_IEEE80211R #ifdef CONFIG_SHA384