netdev - Re: [PATCH] brcmfmac: cfg80211: Use WSEC to set SAE password

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <edcabef3-f440-9c15-e69f-845eb6a4de1b@broadcom.com>
Date:   Tue, 14 Feb 2023 11:07:55 +0100
From:   Arend van Spriel <arend.vanspriel@...adcom.com>
To:     Hector Martin <marcan@...can.st>,
        Arend van Spriel <aspriel@...il.com>,
        Franky Lin <franky.lin@...adcom.com>,
        Hante Meuleman <hante.meuleman@...adcom.com>,
        Kalle Valo <kvalo@...nel.org>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Double Lo <double.lo@...ineon.com>
Cc:     Sven Peter <sven@...npeter.dev>,
        Alyssa Rosenzweig <alyssa@...enzweig.io>,
        Linus Walleij <linus.walleij@...aro.org>,
        asahi@...ts.linux.dev, linux-wireless@...r.kernel.org,
        brcm80211-dev-list.pdl@...adcom.com,
        SHA-cyfmac-dev-list@...ineon.com, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] brcmfmac: cfg80211: Use WSEC to set SAE password

+ Double Lo

On 2/14/2023 10:33 AM, Hector Martin wrote:
> Using the WSEC command instead of sae_password seems to be the supported
> mechanism on newer firmware, and also how the brcmdhd driver does it.

The SAE code in brcmfmac was added by Cypress/Infineon. For my BCA 
devices that did not work, but this change should be verified on Cypress 
hardware.

Regards,
Arend

> Signed-off-by: Hector Martin <marcan@...can.st>
> ---
> Note: must be applied after:
> 
> [PATCH 06/10] brcmfmac: cfg80211: Pass the PMK in binary instead of hex
> 
> Since that is reviewed and this isn't yet, I expect that will go in
> first anyway.
> 
>   .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 46 ++++++++-----------
>   .../broadcom/brcm80211/brcmfmac/fwil_types.h  |  2 +-
>   2 files changed, 20 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 18e6699d4024..e4690d56e7c3 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -1682,52 +1682,44 @@ static u16 brcmf_map_fw_linkdown_reason(const struct brcmf_event_msg *e)
>   	return reason;
>   }
>   
> -static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)
> +static int brcmf_set_wsec(struct brcmf_if *ifp, const u8 *key, u16 key_len, u16 flags)
>   {
>   	struct brcmf_pub *drvr = ifp->drvr;
>   	struct brcmf_wsec_pmk_le pmk;
>   	int err;
>   
> +	if (key_len > sizeof(pmk.key)) {
> +		bphy_err(drvr, "key must be less than %zu bytes\n",
> +			 sizeof(pmk.key));
> +		return -EINVAL;
> +	}
> +
>   	memset(&pmk, 0, sizeof(pmk));
>   
> -	/* pass pmk directly */
> -	pmk.key_len = cpu_to_le16(pmk_len);
> -	pmk.flags = cpu_to_le16(0);
> -	memcpy(pmk.key, pmk_data, pmk_len);
> +	/* pass key material directly */
> +	pmk.key_len = cpu_to_le16(key_len);
> +	pmk.flags = cpu_to_le16(flags);
> +	memcpy(pmk.key, key, key_len);
>   
> -	/* store psk in firmware */
> +	/* store key material in firmware */
>   	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK,
>   				     &pmk, sizeof(pmk));
>   	if (err < 0)
>   		bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n",
> -			 pmk_len);
> +			 key_len);
>   
>   	return err;
>   }
>   
> +static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len)
> +{
> +	return brcmf_set_wsec(ifp, pmk_data, pmk_len, 0);
> +}
> +
>   static int brcmf_set_sae_password(struct brcmf_if *ifp, const u8 *pwd_data,
>   				  u16 pwd_len)
>   {
> -	struct brcmf_pub *drvr = ifp->drvr;
> -	struct brcmf_wsec_sae_pwd_le sae_pwd;
> -	int err;
> -
> -	if (pwd_len > BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) {
> -		bphy_err(drvr, "sae_password must be less than %d\n",
> -			 BRCMF_WSEC_MAX_SAE_PASSWORD_LEN);
> -		return -EINVAL;
> -	}
> -
> -	sae_pwd.key_len = cpu_to_le16(pwd_len);
> -	memcpy(sae_pwd.key, pwd_data, pwd_len);
> -
> -	err = brcmf_fil_iovar_data_set(ifp, "sae_password", &sae_pwd,
> -				       sizeof(sae_pwd));
> -	if (err < 0)
> -		bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n",
> -			 pwd_len);
> -
> -	return err;
> +	return brcmf_set_wsec(ifp, pwd_data, pwd_len, BRCMF_WSEC_PASSPHRASE);
>   }
>   
>   static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> index 792adaf880b4..3ba90878c47d 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
> @@ -574,7 +574,7 @@ struct brcmf_wsec_key_le {
>   struct brcmf_wsec_pmk_le {
>   	__le16  key_len;
>   	__le16  flags;
> -	u8 key[2 * BRCMF_WSEC_MAX_PSK_LEN + 1];
> +	u8 key[BRCMF_WSEC_MAX_SAE_PASSWORD_LEN];
>   };
>   
>   /**

Download attachment "smime.p7s" of type "application/pkcs7-signature" (4219 bytes)