From patchwork Tue Apr 16 00:05:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wang X-Patchwork-Id: 1086100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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.b="oUWp5AqY"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bkuwzpJ5"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44jxxd0nYVz9s3q for ; Tue, 16 Apr 2019 17:36:05 +1000 (AEST) 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=QzwgjkUjPBaKU5GBXJIjFZJOV3FigiRhY/XdxKDvfSs=; b=oUWp5AqYPxNR/r i29R2qufdMCnQYqwRC0r/o4CTs3p0SDk0FcnBN8m18Ss5eb8HZz0+lF56nTp8+OmQlYHapAOr9SWk CEn49OWQOWhxWI74ODQ6yMpKwX0EkA+v+whIdzGCrt7q/1i8kyQn+sKw4hiPOolwPlkVMqWgsRE81 MlptY+hQ34esi3gfGbJz0Nc4gP24YVozLA3eWh3bJ4FpNGY+UCd2vBohMb3JreeY0nZ6rOMqtdyn2 Ihk3bPSNrsDImgUwa0afDkJSyNl09fj2MRIWVXe3p0GOKtM/yAe2WE4VFu3uSmP2haqIh1on5L4Gv UIub70OJi35rYd5otTaw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGIdM-000589-MY; Tue, 16 Apr 2019 07:36:00 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGBbn-0006kW-PO for hostap@lists.infradead.org; Tue, 16 Apr 2019 00:05:57 +0000 Received: by mail-pg1-x544.google.com with SMTP id p6so9370147pgh.9 for ; Mon, 15 Apr 2019 17:05:54 -0700 (PDT) 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=S8yRT238ESvrfWCM1Gyp5DNwVcCUqhp69KJ+fhVOuio=; b=bkuwzpJ5X5zW3Obk8YUEKTiiD74xeP9YbbXI3RT7EW78oVAe81BJfOVCcNWKoOGmR6 cu+6hFmXRXYPcU2xL4hF/KhMLAUMjxyRTWVof+cyxT7R525m3/+sWQs4Y4M8t2PdKLLR jV0TUX2iitE85OU8lTAyiNF3vPRekVUdC/sbw= 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=S8yRT238ESvrfWCM1Gyp5DNwVcCUqhp69KJ+fhVOuio=; b=J0MjqlJvZ5ZCo7eoQSb6EKVKxO8wbXki/ujDLQrNcfi3lb+Xd1SGh6UjriWU6Ks0bk cJsQlmMUNEkMaNYin9gLnoZoyViuX4H/g7F8pEo66NgnzL0KsJVF5masAUIJbb6Tx6U7 yZWKMGckB7Jayqx73n4iIHRa1st4ff/kovxyfAqEnri38bzv1xaSd4c8/l+iSGj55lEb wRlk7/9jK+Wn8h/DSzaKnNpznKyaov9cQvZg6qBAhbfBtdrbXDjqn/fjwsijXUjd9RI+ PRxI/DOYTbPWGRDxdp+HqJ7sfJNqfVtsiIwNVzXiqXhvKV5V5OHddfrtF8ruXk1jiJen EYQQ== X-Gm-Message-State: APjAAAW8bZTyj32rSh4YbPm4W2gO0l4Oot80RNAOsmgvierHHSAFFCws tfVIWB1RFfeajVSbd6Ow8eRoWw== X-Google-Smtp-Source: APXvYqzrEZRVvIDrfzvf+bEdCIdGJvjD8JyiIq16tFFZrEJooarbzuPgwNPhawh55TMXJStZSizjfQ== X-Received: by 2002:a63:4e5b:: with SMTP id o27mr73686342pgl.204.1555373154310; Mon, 15 Apr 2019 17:05:54 -0700 (PDT) Received: from localhost ([2620:15c:202:201:2b10:8627:31e7:c5ec]) by smtp.gmail.com with ESMTPSA id k186sm70201088pfc.137.2019.04.15.17.05.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 17:05:53 -0700 (PDT) From: Matthew Wang To: j@w1.fi Subject: [PATCH RESEND] check for driver SME support when selecting FT suites Date: Mon, 15 Apr 2019 17:05:51 -0700 Message-Id: <20190416000551.39874-1-matthewmwang@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_170555_850791_702DE957 X-CRM114-Status: GOOD ( 11.90 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 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:544 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-Mailman-Approved-At: Tue, 16 Apr 2019 00:36:00 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hostap@lists.infradead.org, matthewmwang@chromium.org Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fast BSS Transition (802.11r) cannot be performed without driver support for Station Management Entity (SME). However, wpa_supplicant will select FT suites (FT-PSK and FT-EAP) even when the driver does not support it. This change has wpa_supplicant select the FT suites only if the driver supports SME. Signed-off-by: Matthew Wang --- wpa_supplicant/wpa_supplicant.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 20ae588ad..0a758f840 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1440,7 +1440,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, pmksa_cache_clear_current(wpa_s->wpa); } #endif /* CONFIG_SHA384 */ - } else if (sel & WPA_KEY_MGMT_FT_IEEE8021X) { + } else if ((sel & WPA_KEY_MGMT_FT_IEEE8021X) && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)) { wpa_s->key_mgmt = WPA_KEY_MGMT_FT_IEEE8021X; wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using KEY_MGMT FT/802.1X"); if (pmksa_cache_get_current(wpa_s->wpa)) { @@ -1450,7 +1451,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, "WPA: Disable PMKSA caching for FT/802.1X connection"); pmksa_cache_clear_current(wpa_s->wpa); } - } else if (sel & WPA_KEY_MGMT_FT_PSK) { + } else if ((sel & WPA_KEY_MGMT_FT_PSK) && + (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)) { wpa_s->key_mgmt = WPA_KEY_MGMT_FT_PSK; wpa_dbg(wpa_s, MSG_DEBUG, "WPA: using KEY_MGMT FT/PSK"); #endif /* CONFIG_IEEE80211R */