From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6755CC7EE22 for ; Thu, 4 May 2023 20:46:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229828AbjEDUq1 (ORCPT ); Thu, 4 May 2023 16:46:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjEDUqD (ORCPT ); Thu, 4 May 2023 16:46:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2CF31634F; Thu, 4 May 2023 13:44:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 63137637BC; Thu, 4 May 2023 19:48:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76662C433D2; Thu, 4 May 2023 19:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229713; bh=C2j/AT/nP4s4wQkqsrksdlFglKDmaSdw3XqGBuSGaZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CfCgddr9Dk5kdNpAHO6Hiw1Lww9nDbIAgnItVf+D4aVk5afiUjL535ZHfestWC3bW HBwW0XfViD316m33waWZuASpFBmxvUX9oBfh7w9TGkuil42mhyfuVmweNzyNao7cVu 0hjNR1vYzZYQrEgSomMo/JYDD8peMX1RXCpmJssLiSqFIIKBhoJ1Am7RROyo4Yvg6J EwS6eca/MuJR/FzeTnKU8pvgHAQ/g1CH89zbBTrdXK+XFqajOg2V+soD5hBfZoy2g2 1XKqUbCLm4R2I8Flih+xO1hFuNT/TRClw4ujuNFilbtUQTmOWXDCJa1GiEKfoBjm1w 8mUD1hp3iPGYg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hector Martin , Linus Walleij , Arend van Spriel , Kalle Valo , Sasha Levin , aspriel@gmail.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ian.lin@infineon.com, chi-hsien.lin@infineon.com, wright.feng@cypress.com, hdegoede@redhat.com, wataru.gohda@cypress.com, prasanna.kerekoppa@cypress.com, ramesh.rangavittal@infineon.com, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 03/30] wifi: brcmfmac: cfg80211: Pass the PMK in binary instead of hex Date: Thu, 4 May 2023 15:47:56 -0400 Message-Id: <20230504194824.3808028-3-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194824.3808028-1-sashal@kernel.org> References: <20230504194824.3808028-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hector Martin [ Upstream commit 89b89e52153fda2733562776c7c9d9d3ebf8dd6d ] Apparently the hex passphrase mechanism does not work on newer chips/firmware (e.g. BCM4387). It seems there was a simple way of passing it in binary all along, so use that and avoid the hexification. OpenBSD has been doing it like this from the beginning, so this should work on all chips. Also clear the structure before setting the PMK. This was leaking uninitialized stack contents to the device. Reviewed-by: Linus Walleij Reviewed-by: Arend van Spriel Signed-off-by: Hector Martin Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20230214092423.15175-6-marcan@marcan.st Signed-off-by: Sasha Levin --- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index fc622e6b329a3..5f55abf3bb6df 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -1350,13 +1350,14 @@ static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len) { struct brcmf_pub *drvr = ifp->drvr; struct brcmf_wsec_pmk_le pmk; - int i, err; + int err; + + memset(&pmk, 0, sizeof(pmk)); - /* convert to firmware key format */ - pmk.key_len = cpu_to_le16(pmk_len << 1); - pmk.flags = cpu_to_le16(BRCMF_WSEC_PASSPHRASE); - for (i = 0; i < pmk_len; i++) - snprintf(&pmk.key[2 * i], 3, "%02x", pmk_data[i]); + /* pass pmk directly */ + pmk.key_len = cpu_to_le16(pmk_len); + pmk.flags = cpu_to_le16(0); + memcpy(pmk.key, pmk_data, pmk_len); /* store psk in firmware */ err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK, -- 2.39.2