From patchwork Thu Jan 30 09:08:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ouden Lin X-Patchwork-Id: 1231343 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=gmail.com 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=NeM0VPEO; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EhJiDKtW; 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 487ZK46fC2z9sP6 for ; Thu, 30 Jan 2020 20:08:40 +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=XPKEfBtr4dQjpBozIoPdtcOI4xwTRShi7CWWVJAl0KA=; b=NeM0VPEObgAdhj 1nO7g5tOic7UYKPv61YcswGfxE2TvifFLXJNqj5C1SNjBsvZKGLLPV/2Uu5/bUpDMRzH1/AzAPSs7 /D2WvsXx2NXGf8mmJMSSqiMPSSZTe1P8ozy1gt9hSdihkwSFnBi10uAQrtBkC/goXb/cYYQkXCwG2 N6vPigLLpC49MZ+LdjnXIlgzlAlj7DxqIApYHG18cLsfd9QBzb7vCo+C86it5ejgSW0vIwO/Ft5vf BGWB03glhRhzJ8HGPhPTlKoOQZ28etXop0MHPXr5jMtQjbpc3tildTcXMJidA5jY8NbpLVxH3DML5 GXE4sv1jS+4cA/B5wr0w==; 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 1ix5oP-0004RE-E6; Thu, 30 Jan 2020 09:08:33 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ix5oL-0004Pu-Ul for hostap@lists.infradead.org; Thu, 30 Jan 2020 09:08:31 +0000 Received: by mail-pg1-x542.google.com with SMTP id 4so1314029pgd.6 for ; Thu, 30 Jan 2020 01:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uhip0ZXS9vT6V0Lyn9CinkgPVpym+f2Q5dRoZhXVO08=; b=EhJiDKtWArWJUlpQwPtkInGLwuvzCogmdiMFCfvJC0KePd3lk3QyDDshQKzvUcViB3 BgqQFLZ8kdRzW63JqGVzdSpHnu2qaMgBwlZ+ettgFtIB2NW4mCXzaqYT7HtepNP48e8n 9KRO6F+tQLp98XreFfArqWGyiBzBKvcbwGt97bAXR96Yayih5iz2PEGaSNnp7DqC0y8e hyPKcFiZ+XL3CAYwxPaRoKz0OxbJ+kxgnJrsrSLUldD7NimqgPtkQH0nEwPuV0PVSBuq 2ItUJcXOcReJLxc7BThBqS+438rHDxCnwR5JTblIq+xN3b/EOj5J1ihFlfDfECFzLDQh mfcA== 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=uhip0ZXS9vT6V0Lyn9CinkgPVpym+f2Q5dRoZhXVO08=; b=XzDev62gCcc/1KKNMhcotr9cR1Ft/0/9h4m4pZQnIKLVuHeNl6XY5uQyhTfaNLkDAO 0iaPxQUqsSi46/NH9pLvZLQMs6Dn3V61qCBDKO3zKAV0+1OFMYP6pkFPCo2L0BgVM6ik Mqnd0GQU8LXkx7XJpoGUp3XYHBP3/Y+YZ9yIntTdMpy+01/p09IqylRTNySqv12Z1hlT Tyx0+GquzqWPt9UFQKZmB69F41oInh9hOd697/dqnGX4/7jacye747IflouoN+CgfWUh 34uKiDO6xjp3e9Gg5LDzSFkU6dQQawsLq3pI2H18KZu0bntNczP+r5l5qbe8HMJuuu0P nRkQ== X-Gm-Message-State: APjAAAUKMofC3CN0gIzy0PnEmhJdCDGqCqdM+TD5dHIhUO3nk1NHZxDU XjP3iSFjHQQ0BOMVTbL74yrFUnDC X-Google-Smtp-Source: APXvYqyUqyVkN2OWw0v98ZWlRhk5wwdZg+bAJF6H45QVjr2orLFxX+2x2xkx78QFiaXEWWe+6TRQ4A== X-Received: by 2002:a63:dc04:: with SMTP id s4mr654707pgg.434.1580375307086; Thu, 30 Jan 2020 01:08:27 -0800 (PST) Received: from localhost.localdomain (36-229-47-109.dynamic-ip.hinet.net. [36.229.47.109]) by smtp.gmail.com with ESMTPSA id hg11sm5586098pjb.14.2020.01.30.01.08.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jan 2020 01:08:26 -0800 (PST) From: Ouden Lin X-Google-Original-From: Ouden Lin To: hostap@lists.infradead.org Subject: [PATCH] SAE: nl80211 send mlme frame fail (external auth) Date: Thu, 30 Jan 2020 17:08:14 +0800 Message-Id: <20200130090814.70512-1-ouden.lin@realtek.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200130_010830_017065_8FF71D2F X-CRM114-Status: GOOD ( 10.31 ) 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:542 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ouden.biz[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: Ouden Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ouden When external authentication is used, the station send mlme frame (auth) to driver that can't get the frequency (bss->freq) after hostap.git commit b6f8b5a9 ("nl80211: Update freq only when CSA completes"). This patch will use the assoc_freq to send the mlem frame, when external authentication is used. Change-Id: I92ca155094699a6be3e7a27f8b5ed58c3ca38ea7 Signed-off-by: Ouden --- src/drivers/driver_nl80211.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 64bea49e1..fa0a73094 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -3747,6 +3747,20 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data, encrypt = 0; } + if (freq == 0 && drv->nlmode == NL80211_IFTYPE_STATION && + ((drv->capa.flags & WPA_DRIVER_FLAGS_SAE) && + !(drv->capa.flags & WPA_DRIVER_FLAGS_SME)) && + WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT && + WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_AUTH) { + + if (freq == 0) { + freq = nl80211_get_assoc_freq(drv); + wpa_printf(MSG_DEBUG, + "nl80211: send_mlme - Use assoc_freq=%u for external auth", + freq); + } + } + if (freq == 0 && drv->nlmode == NL80211_IFTYPE_ADHOC) { freq = nl80211_get_assoc_freq(drv); wpa_printf(MSG_DEBUG,