Message ID | c2adfb3c58d0ea72ee75f0a5f4fcb079d21734f6.1527814610.git.peter.oh@bowerswilkins.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kIpLbyx3"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="uyqkWVlI"; 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 40xmMY3R9Rz9rvt for <incoming@patchwork.ozlabs.org>; Fri, 1 Jun 2018 11:04:57 +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:References:In-Reply-To: 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: List-Owner; bh=KQUL3tbu8gRamM1uF72pPh6JdHX9Ls21tg87VCiPCts=; b=kIpLbyx3hA1AoK P3CseoNViFdydL3/5fl4E1Fu7farGXFBPgZpzpgN2FBaBkY4zg4xshpGnt9nN6ZfUACBbov8OUPkf CoWPDcvGQSdFebpxaBEp8WYFMm8rJOYlNe/1gNf7UzwJX2PZzDK8hlODioohxCONvwsRkaOp5ovjU AtvKVqX5DLn9gnfuwNBkg6YEi2eQDL2DpYqWYf5PA23tgNUTGrz/hs3bB2ounhdJy9bUe6B56mqgE vAGnDUodSQbQYXEF9OYkiKKEdW8JHKvkprhHvNX39vZ/RyXxVK1FGsoqlT1CKdmoS3oBlo0tU1Kbe ueOarfyuMZqco0QG3eIA==; 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 1fOYUr-0001Xu-2y; Fri, 01 Jun 2018 01:04:49 +0000 Received: from mail-eopbgr40056.outbound.protection.outlook.com ([40.107.4.56] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYT6-0000R6-NI for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:03:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8D1wwRjnHXN+p52UjhfSuhilHnXDSiKuyI/BcxDR0uU=; b=uyqkWVlIctmJFpYF31cndK0Eij7jwQQadpW9W5hrfGKtycpl/+HQuqG3Oky/01M9eLm4RDh/ruQ0wQF9e5tsX5nf3h8cYF4UOxS1tvKDD222f3DvljOpJp889iyVTiZYiub/wZlvCAkrBBSeC83a7EI8mn+RrDsx6gCY+4AAiGU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:f8b1:4178:69fc:b611) by HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 1 Jun 2018 01:02:31 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 03/15] mesh: relocate RSN init function Date: Thu, 31 May 2018 18:01:57 -0700 Message-Id: <c2adfb3c58d0ea72ee75f0a5f4fcb079d21734f6.1527814610.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1527814610.git.peter.oh@bowerswilkins.com> References: <cover.1527814610.git.peter.oh@bowerswilkins.com> MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:f8b1:4178:69fc:b611] X-ClientProxiedBy: BYAPR01CA0007.prod.exchangelabs.com (2603:10b6:a02:80::20) To HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1657; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 3:XC95FJVaZQqnv6y7X6wa7vGUwoohVDXDFJjnZDjVti9uVZtAVkDAsDURVxDBpuXppvyYeTyINr/eroWZyk5EtVhQ1Elhx9vM1zyERoN+PCv381FRd1mPNSmRHIlXF0032djqCMPPYAbFquVmrTeyqJ2wxP5JyzxhIiaVXJLmFiscACXK9oMw2DdSWsjHtTzX0ZYYQhLRS3PcR426Tbbrao/l1dqmEAEH67t4aTE5VPE1KhnGlD7Wl54h54fIupI4; 25:1ZpDFC7oaCpuQwYqoagVpp7Jy2TaGukZQQ1IBYq42Lqa1lPNwMdQ8mRl7OQdaFpdHSWyQnOqp+6W1pbe649k1oxV1zo82l8ai54i5RQ4N4jUTZBhjoJbzL32OLv1epm12a6MTGK9z534+q52/77Eyk2C5b5op/G3/zvus2yWG9aSFRWaXdIT58yS4R10UtdWUVHA2QjK7z21Dzif6wTXc6R04FMq2yKV5QIEfNn+z0+4ilmWxigdOwZ2mdRGLx0ZKLQTlcucDUzsNMBk5R0w+Z8T0LguudSjd/sNtE5CKfphs2CIgTzzzQLz2JARaVN6GKJamcjn9JwkDFRqSh613g==; 31:pkKy+4/LJvSy5nBDmFkwGytCL86S/73yOotLZS4ETbIda4DBw6LV/ylQu9eXhkootfd7LZ9U54X1zcntJKYSi1J+t9mnjEEW9Apq32o3ETPEhunh7yHZFY7S3Jc3EwJroBvAnuhdA3rhk879XWnp+gqaruqeWONesVI0S+4YZz/lGb4mYYk8fej3NJJ/KHuq/m4Q9eF/HDmKIhNTPVuhlkfAJDPj/bT1GpxjSzxLFes= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:Z6nFl+gYFUeywd8IWwuM8wKnA+nFGUNZgy+rHBdhnSoAd9Ahe8H2FuyyqirfkV/qm7eAzEykXaVoJLzfpm4cmFIRNtAdrJCV7ixlvmXfmOuaJJOytdUu+DkzsMw1g6w292LnQqA/bkMDdV1PPeAQ6sPcCWff2HUYKHesT7Wl6ku0XB7QucRhV55CHWCDSRbS0+cxeX3j/YDNDVHyMV8EUmbkBvDSvrJ/uKYwEXCOf3dJptb3cf+RzpJjOX3RpP3rgYI9M81ex5DvgHRLfO/jjrVN5GuXwKOrGlO6Dj1d966hE7FlRPz/64LnTK3vk6Pa2SsgOVEqtoirt4zKuTqBey57FgzhW14d6a6QREM5QIfelKhUnN12lDhZorBPeQMug8fDIBQ8RKXP0TbEV+cw4ufqT/PaMewoAwlmyKc5ltQ=; 4:GtzOM2a8ZftEGxrcMpwYhtjj5p8fp1P85GD0M2K6RySp0SLD9IMca3/Dw6K1cQJMZPQ5At+o/F2KvuB/gCDh831Et8S3vUptlBi8dQoNZ4clGCZirigtZ2XdjIBDUvG7CULeMqhxKC0YitmEARR/XR/Oxf270uV4aD/wnmVj92ldcwqY/8VwSzbgoGe8KQO11RH/DF618R5exzRA0QE0IodlOKsxNShBdMtWsyYGAZyZwmMKjzGMBFphFq+PJ66p0W5GOYeSsT+nmG1kSnRZ6Q== X-Microsoft-Antispam-PRVS: <HE1PR04MB16577883CAAC50EE36220F0299620@HE1PR04MB1657.eurprd04.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR04MB1657; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1657; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(346002)(39850400004)(39380400002)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(86362001)(6666003)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(97736004)(33896004)(68736007)(6506007)(118296001)(8676002)(7736002)(50466002)(47776003)(5660300001)(386003)(3714002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1657; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB1657; 23:9P7mJ+QADlbEkcRb9vshn4JxDt9HsACTGKt54bfQj?= cOgqqU9uE0oAKXphwmVBTBbxk3Tg2bx/igUYTnJMgGyh4m7hAxPhHa7DnJ7K7ji7tf31lEhRtcfmsYypUbTyfdUWbDGHmqCCkyFQbxnQiwEoDPAvtlTNozYoG7i1Vq5Fqso1UJAt7sKdTOMPY4S1RX3L82GsmWCAylqpHqRhilJS4Yhamzq+oAn48h+eypz15k/NHl1EhwR9oeoh5EJ6oP/B4voXxQReKCtBl1j//5QmzRbftFTbkh0o5xOQ8u/OginMjHEyAoZs74zaAW2l1BaQxnrGjlprqycaNU8jaVeQPC6il9+nEINBPxxN6bq/iHONUGYe8wy4Y+l/Xji9T2naImMdotnJ6loqbvdh9uJdwXxOSYIUhhaAolYKDoY8rLR+AOTqVuI1uY4NpJ8KcAwWpEzCcfEOavtgkM9avH6QZYFjbR7dGRUVtSCU46lPhBjTK3rvb3hU8yV8+rxJI3BxRaGQcDcyi+nef8hignjKZxupVRv8PllpZ5eZhEZPZTmJQWxYyFOdsDAsgZnmr0Gl0BCokp9U/gfcteLxxlPrSsEJQKzIdOR6BZ+v+B6qBNrWRoCGO2nVPPeAtYnxAE5FL32YpSZPOMqKMUdvydwWR0py6TddYvhjiVzIiZhMYG2rPP+pWoDOakaGvyNhA62hAT4l+i/4WOlpVjSAys54qt8sAc7brbDiHncAVsIhc0plM1xd2YQdQj6o0DTtOjKpPkrv+PsOw9avXYopt5u+W9l8ecrvGlR86iwzeubwdKD9VD1ivVXx2+kF0ouBW21XqmU3i9gJEH9o3DHt9z4OiUWRJhA52ahyUSwCBg0i5dw2WwZbvepKsDXZFnQMsO6A/jD9/UGCjKb85BBLRlr+fhe8w1kS8tfwRYnTXsyp7UuE/QHaiABdgE2X/F64wMpLKO5DC35t0HtoA9x0Ax4p4i+4uA+deZNpCHPmWX5Qoso4yGFtBrm9wkfwbkMww3CO4Zj50rSAeT6MZxQeF25XihXndr/7qZRsriiOr5h1ZFP6Dik4/HG6SOH3pXdHnkvXaggTBTqF/HZrQzElaBHhhDjUGhSWokpTzBUSBAs1ZDeFCL33W8SMhYqYNW6NYlq90Y8uDlGU6yoZJ5RI8ZVIHMtPq+112yfcqmZP1obk+zdTMaaVshOrYMirb7PP8jws+6cGxSWScmkQHs9y/EDf1Frg5FD+ZiTjQG557u1MC27GIM0m6XjFxdK87l42nDtD697tMK8eUzCnpCqO4ViHEyshKx4FJMpdKp8/K0bZtulc/ASalU39tqvVVCvc/LPmW5+26feJdvTih2tOcieet34QGlc/+23qExZNiYAEPS+bd4bHHJDrdZ+2lEZAnb5 X-Microsoft-Antispam-Message-Info: uj1eC1myzpjiYrlT90eU1ALraO2OhxFRNlP5zQnKmAkVw+LFOlmEAshLcjqNV3OVSjRnFoGVklQhaTh37mLgCFxYpv8pI4OK75L/wKKMCUVDNkGQeESRBZ/52zIrk7cDdAWRrGKbugYh7nJ00kX3dgAFBYPUiIYPHiGVUmeHr6f5r0wd110gPeGzkHP9v1FJ X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:t2p2n4X1kFud2FYS3uavknKhBAY7YeyQKqCcxOkWNCFcy7Rcw7vzkt32lvfySSoO9A/Bcz+ibLBaewYZe30sjPzPSTjwcvC0r43qAyVBJ8DVo4EMQJZEIfyJA2MYi9BvYQEMJcFHJJ9od/BsitoqwHfQ0LmrHapDMes2Dx/BaKKBMdNgM5nGZdGY5fdnHIsyb7ur9oD1hK9F23aXDumvewn+4+zNgBp6sl31sD6IVH4RhULYqIG+ys0U/fg+JMa1csG2MC0eicMucruXh3b3OhhNzwsarI4PZfEXcEVBbdnE1O07XvFz85PyGXrNLU+4D8vGjNqI2Due4/4r1AvPgm8xPL/gT7GULvu6ML7wIaanGVinKOy/Y+kHbbpiFM8d8Lt7+Hjrw0YVk66mTyPbSEVyoUQxZVRV1hixjCVVGvWcekjGyTmUImSnnRzQ/Ze8y/SZpqCERkWbo45hECK6vg==; 5:lo4rbVCY8NLP1HtkspQ1CVe1Lx274Y775dJZbPoPSSpjH1fgxeGsMqJgndRMUZjlgQuPULRFbH5RWuSM0TZ/3NPvoShZB18c003D0W4SouMP2lf4tlpLWPBtmuZDhZH+bKVrgKBD3krh99RmGXmZsKPEeb7i4eWI8jp82tmi8DA=; 24:4JEL3j1DrAQIIgtOqJb7LOSC5Xosw5zKJPo+V3DgLh54mjGFxyNTS/iF+8ICSf5b1sDVYSRkX79rmubTY2z+W02B19QOLuGRBtU8GFbvntE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:s2PsWVosDqhtmKEfGdRRhQSYUuY4gtk0YjoxRA8daCvz+yR0TAkmV7J4Rk+gOQEO/x8OFsA2Pf1gEnv6gvIZPDwF7N8Lw48cx+6AgznZT5+2ncJXmae+A+lhxoBUHKCL1G+ia5ENzc0qIFwQc/b4U5sQjWjGSowfUrVPlPHKFaMAAZHWSU5VnZAGChEvrU2s8c/8UvFdY9QdLsbHk2uBS/oJuegXjYTXfxgcIwQ/Rxgoze4xyozTt6/0polPkn5f X-MS-Office365-Filtering-Correlation-Id: ed2e4701-c4a4-4c7b-938c-08d5c75b5afb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:31.7993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed2e4701-c4a4-4c7b-938c-08d5c75b5afb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1657 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180531_180300_924119_9EDE710C X-CRM114-Status: GOOD ( 10.09 ) 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 [40.107.4.56 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Peter Oh <peter.oh@bowerswilkins.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: enable DFS channels in mesh mode
|
expand
|
On Thu, May 31, 2018 at 06:01:57PM -0700, peter.oh@bowerswilkins.com wrote: > RSN init function should work together with mesh join > when it's used. Since mesh join could be called at different stage > if DFS channel is used, relocate the function to mesh join. > It is still the same call flows of mesh join before this changes > if non-DFS channels are used, hence no side effect will occur. This breaks the wpas_mesh_secure_sae_missing_password test case just like Masashi pointed out earlier. That would imply that something is wrong here in checking valid RSN configuration during wpa_supplicant_mesh_init().
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 4e2814b..2358bc4 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -338,9 +338,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, return -1; } - if (wpas_mesh_init_rsn(wpa_s)) - goto out_free; - wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf); return 0; @@ -386,6 +383,12 @@ void wpas_join_mesh(struct wpa_supplicant *wpa_s) struct wpa_ssid *ssid = wpa_s->current_ssid; int ret = 0; + if (wpas_mesh_init_rsn(wpa_s)) { + wpa_printf(MSG_ERROR, "Init RSN failed. Deinit mesh..."); + wpa_supplicant_mesh_deinit(wpa_s); + return; + } + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher;