From patchwork Wed Dec 13 17:50:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouni Malinen X-Patchwork-Id: 10110493 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4999A602B3 for ; Wed, 13 Dec 2017 17:51:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36AD028653 for ; Wed, 13 Dec 2017 17:51:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B702289A7; Wed, 13 Dec 2017 17:51:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC0E328653 for ; Wed, 13 Dec 2017 17:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753011AbdLMRvb (ORCPT ); Wed, 13 Dec 2017 12:51:31 -0500 Received: from alexa-out.qualcomm.com ([129.46.98.28]:64522 "EHLO alexa-out.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbdLMRvb (ORCPT ); Wed, 13 Dec 2017 12:51:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1513187491; x=1544723491; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=NmZ6YB8F2o4j4maTj6uJ1rLKMBskhSs5OwB6qeuKgy4=; b=t0TsJU7bzwhUkHhgGBuMStiEylwZQnFVcyCmunhvtzQDSjan49gaBKad epqeKuQMfo5K4bRZsw4Rtr1Nn+1WZWIwX5chZedholcNoWHj1JN7rwz43 eFLIQOFF7QSma3tzUEoXtxYUxSo6zftX0i3M6Ldffx3OkIo64MJ+PH95Z o=; Received: from ironmsg04-r-new.qualcomm.com (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by alexa-out.qualcomm.com with ESMTP; 13 Dec 2017 09:51:30 -0800 X-IronPort-AV: E=McAfee;i="5900,7806,8743"; a="1549631550" X-MGA-submission: =?us-ascii?q?MDENTh0gq3QVzgq4cIOmmMBAwnqtgzR2rxMyeJ?= =?us-ascii?q?DpI4CWDobWFGk6fNf/LGgL9pJjLv5ddJeuilTNiBlLBtlOPaJU3odOyw?= =?us-ascii?q?GKksRTJ2ZeES+80BJuUXzri9CU5T+worlu8LlYn26+PDx1mHMJJx5Xlj?= =?us-ascii?q?5e?= Received: from nasanexm01b.na.qualcomm.com ([10.85.0.82]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/AES256-SHA; 13 Dec 2017 09:51:30 -0800 Received: from euamsexm01e.eu.qualcomm.com (10.251.127.42) by NASANEXM01B.na.qualcomm.com (10.85.0.82) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Wed, 13 Dec 2017 09:51:29 -0800 Received: from jouni.qca.qualcomm.com (10.80.80.8) by euamsexm01e.eu.qualcomm.com (10.251.127.42) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Wed, 13 Dec 2017 18:51:24 +0100 From: Jouni Malinen To: Johannes Berg CC: , Srinivas Dasari , Jouni Malinen Subject: [PATCH 2/2] nl80211: Allow SAE Authentication for NL80211_CMD_CONNECT Date: Wed, 13 Dec 2017 19:50:38 +0200 Message-ID: <1513187438-23967-2-git-send-email-jouni@qca.qualcomm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513187438-23967-1-git-send-email-jouni@qca.qualcomm.com> References: <1513187438-23967-1-git-send-email-jouni@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To euamsexm01e.eu.qualcomm.com (10.251.127.42) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Srinivas Dasari This commit allows SAE Authentication for NL80211_CMD_CONNECT interface, provided this is supported by the host driver. Signed-off-by: Srinivas Dasari Signed-off-by: Jouni Malinen --- net/wireless/nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 72ec615..e920c3a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3916,7 +3916,8 @@ static bool nl80211_valid_auth_type(struct cfg80211_registered_device *rdev, return true; case NL80211_CMD_CONNECT: /* SAE not supported yet */ - if (auth_type == NL80211_AUTHTYPE_SAE) + if (!(rdev->wiphy.features & NL80211_FEATURE_SAE) && + auth_type == NL80211_AUTHTYPE_SAE) return false; /* FILS with SK PFS or PK not supported yet */ if (auth_type == NL80211_AUTHTYPE_FILS_SK_PFS ||