From patchwork Fri Oct 12 09:59:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanley Hsu X-Patchwork-Id: 982955 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=cypress.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lqlfrWA7"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cypress.com header.i=@cypress.com header.b="PIUdmTmk"; 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 42Wjxh60YRz9s3l for ; Fri, 12 Oct 2018 21:00:08 +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=E6CzLs72JZIS3tdCz1T4eVklss317FCKnfCHnQ7C43s=; b=lqlfrWA7PatQLx NDiSiXJ3rBVl1LvSBF3KPTwTtTNo242mgzbeND7MrMV6lBAhxxglbCpNrLm8CXXfYNwQ5EhH2Di0A 5fBqAEbkwjK2+B02sMiJRjgVEStpqcqYR9XMfpccsW29rHUktfASX6tfC05zC3LKxsfbjeRkjcVo5 RWr7sU5y6Y5cmV17k9rBP2pMhxsSvOtnL5x4odMalWsphYMS++cc+PbsjlD1pqh+cgPMSDQpHtM1i HlkcwCmN+gT8ZvJx9uhLTiIaEw0Q5DYU5E0a4HF0f0gL/w5jL3O9HK0vzFoLra0xBPfaEVJoVRO7L JavnWILcooANNm+F29UA==; 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 1gAuEW-00040N-Oe; Fri, 12 Oct 2018 09:59:48 +0000 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gAuET-0003yj-PZ for hostap@lists.infradead.org; Fri, 12 Oct 2018 09:59:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypress.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=28zGDC8vIPd6dLZK2k2WesOw3dq8FseHrjZ+CIJS3vg=; b=PIUdmTmkKe4foPf+Uf5YcayzpwCuzb9d1vpe7Ym1TFAbcw7cLN4e1D6Na5AWv5IUB9Ns5R+UH2Gp0U4P7QXRDWGokwTIAP5GNNM6EyoomHoUM3jyp0MMKTdn1PHFsWhQbQtFAzphU0vDZ/S0lPQmkyfHhRCc47+2L86EzIe6MBc= Received: from CY1PR0601MB1673.namprd06.prod.outlook.com (10.163.232.23) by CY1PR0601MB1578.namprd06.prod.outlook.com (10.163.232.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Fri, 12 Oct 2018 09:59:30 +0000 Received: from CY1PR0601MB1673.namprd06.prod.outlook.com ([fe80::7461:71df:3ddd:fe71]) by CY1PR0601MB1673.namprd06.prod.outlook.com ([fe80::7461:71df:3ddd:fe71%6]) with mapi id 15.20.1207.029; Fri, 12 Oct 2018 09:59:30 +0000 From: Stanley Hsu To: "hostap@lists.infradead.org" Subject: [PATCH] driver_nl80211: Fix 802.1X auth failure when offloading 4-way handshake Thread-Topic: [PATCH] driver_nl80211: Fix 802.1X auth failure when offloading 4-way handshake Thread-Index: AQHUYhJEFNtTmLbQI0CC5HcHGrUjqg== Date: Fri, 12 Oct 2018 09:59:30 +0000 Message-ID: <1539338353-62784-1-git-send-email-stanley.hsu@cypress.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CY4PR1101CA0012.namprd11.prod.outlook.com (2603:10b6:910:15::22) To CY1PR0601MB1673.namprd06.prod.outlook.com (2a01:111:e400:c42f::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Stanley.Hsu@cypress.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [12.110.209.245] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY1PR0601MB1578; 6:1BXysCVHENrwRpdDVREZDLFeJ1h/FqRIP4n1H8ivasMrQNvfUrP7ieQrQ9iwVvQvkB2shwqOdCUc59aoGPkwj46i+pqCy9K6hz81m8uj9tLTPLPnM9PCpi9mIXpX/rxa0bJs5Jxoz7EHgZw0i5p894Zf5JtOXCjDa2vKOG+6TYuKYYQkpqs79jJiQtE+AfrhkdmQ9IgzoGHwsGigR8GnsEv2zHcv2uOAcaImGPXlHxxm18v7zVY1bjCZJhZp7vPubOUPyLTVaq7swwRJgSfQwPsvfspXwHFYFCDI67oRhIGqTuE0QrZ3eH/3i96m+kqJoKZiQTp+Q96KR8pJYuCY8y5c4wRalhnFz8AGps7f8tcHJ2THm2Yj93v/U4ZlPkNW8LPVU6vfQQWYjjY6cNw6Duony1/U7Igcgr9TeXP5EMiWpWv8n4KwNTK26Az7liX6s3sqWgdWqguTbo3WstgTqg==; 5:/CAy+xKxx953SySjm54EGLPVf3X7uNb4dnCMTXJ+erzVS90yZ2xV5TZ1JiA3IGDCZ+4ikPKaHpr1amVPDdgZ12Ge8miYm5ktKm+Ziue0nRBrSBYIZGZHBHoE/MCWNlUSVsyy8bDiHl/2qTLI1mzV5EHcWFMXObun8u4cVVUSzwk=; 7:ymn0BNkRwcl+gAIvRBeg0juQ7a6Gcr1Yjk5N1O5IBdrV9AbIMyhq9HehnS9Sn7u4YfPq3GsiTFfcGd6i6pwQHY0M+2y0I2Er2+lLo6lFbtecVK3hzZSS8KtHzZnJoMGl7AOXicoPyFKfcRNYvniPB3+64JOwLZK6x3u9dq+RMNOkJjHkh6H4fbgEWNlF/xt3wx+PwgZBkaEoM0gxWkD4z/oCs6MgSNNZX7Fz/xw9kxKtYZS9oPaQvUgf7QToyawR x-ms-office365-filtering-correlation-id: 232d1588-40a1-4f11-a081-08d630296706 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:CY1PR0601MB1578; x-ms-traffictypediagnostic: CY1PR0601MB1578: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(258095267146985); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(201708071742011)(7699051); SRVR:CY1PR0601MB1578; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0601MB1578; x-forefront-prvs: 0823A5777B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(136003)(376002)(366004)(39860400002)(396003)(189003)(199004)(99286004)(52116002)(36756003)(305945005)(7736002)(1857600001)(186003)(26005)(53936002)(4326008)(72206003)(2501003)(478600001)(2906002)(97736004)(5250100002)(6506007)(386003)(256004)(102836004)(14454004)(25786009)(86362001)(71190400001)(71200400001)(68736007)(5660300001)(106356001)(8936002)(8676002)(1730700003)(81156014)(81166006)(2900100001)(6512007)(66066001)(316002)(6116002)(3846002)(2351001)(2616005)(476003)(44832011)(6916009)(107886003)(486006)(6436002)(6486002)(105586002)(5640700003)(54906003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0601MB1578; H:CY1PR0601MB1673.namprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: cypress.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: l7eTzsSzgujF8Ls20E9I3OQ2mtW+aFnLVI75Z07HJUD8EIouxugykn7N87ZDVS6NIBqvw2oKiHLi2OP/5okXOn6OHaph9nsaXRhghrdAu6bSn2z+6jiT4JuL4qasu7MFTgijhnNNE7JH5cjscArD+17kvEbPr4IFbTIMMuad/cryjlyJHCFyz5FL0ePpkurJITjnEHhJfSxNCAXo3VucYr9uZINYo9PfsU0CmNQBELoYi1CSzcpvHB3iY8HvGx50J2Kpf/aHVDEDCeM5gxMEa0+47KxXNxxi/C0lENCtoU3EukFfMs52KaYsbQlooKYMU9cFX9hQI99XQjazMB3kaiDeavNYMwBewnIChTxDX+4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: cypress.com X-MS-Exchange-CrossTenant-Network-Message-Id: 232d1588-40a1-4f11-a081-08d630296706 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Oct 2018 09:59:30.5877 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 011addfc-2c09-450d-8938-e0bbc2dd2376 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0601MB1578 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181012_025945_980785_932AEB4B X-CRM114-Status: GOOD ( 11.99 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.42.127 listed in list.dnswl.org] -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_SIGNED Message has a DKIM or DK signature, not necessarily valid 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: Chi-Hsien Lin , Stanley Hsu Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org If a driver advertises 4-way handshake offload support for 802.1X, it may reject the NL80211_CMD_CONNECT when NL80211_ATTR_WANT_1X_4WAY_HS attribute flag is not present. This patch includes the attribute flag in NL80211_CMD_CONNECT for the offload. Signed-off-by: Chung-Hsien Hsu --- src/drivers/driver_nl80211.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 39a02d3ee51f..8699efd1ba51 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -5405,11 +5405,15 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv, return -1; } - /* Add PSK in case of 4-way handshake offload */ - if (params->psk && - (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE)) { - wpa_hexdump_key(MSG_DEBUG, " * PSK", params->psk, 32); - if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk)) + if (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) { + /* Add PSK in case of 4-way handshake offload */ + if (params->psk) { + wpa_hexdump_key(MSG_DEBUG, " * PSK", params->psk, 32); + if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk)) + return -1; + } + if (wpa_key_mgmt_wpa_ieee8021x(params->key_mgmt_suite) && + nla_put_flag(msg, NL80211_ATTR_WANT_1X_4WAY_HS)) return -1; }