linux-kernel - Re: [PATCH v2 06/35] brcmfmac: firmware: Support passing in multiple board

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: <aeff20d6-03e7-b071-79c8-7a7e10d2d686@broadcom.com>
Date:   Tue, 4 Jan 2022 11:22:05 +0100
From:   Arend van Spriel <arend.vanspriel@...adcom.com>
To:     Hector Martin <marcan@...can.st>,
        Kalle Valo <kvalo@...eaurora.org>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Rob Herring <robh+dt@...nel.org>,
        "Rafael J. Wysocki" <rafael@...nel.org>,
        Len Brown <lenb@...nel.org>,
        Arend van Spriel <aspriel@...il.com>,
        Franky Lin <franky.lin@...adcom.com>,
        Hante Meuleman <hante.meuleman@...adcom.com>,
        Chi-hsien Lin <chi-hsien.lin@...ineon.com>,
        Wright Feng <wright.feng@...ineon.com>,
        Dmitry Osipenko <digetx@...il.com>
Cc:     Sven Peter <sven@...npeter.dev>,
        Alyssa Rosenzweig <alyssa@...enzweig.io>,
        Mark Kettenis <kettenis@...nbsd.org>,
        Rafał Miłecki <zajec5@...il.com>,
        Pieter-Paul Giesberts <pieter-paul.giesberts@...adcom.com>,
        Linus Walleij <linus.walleij@...aro.org>,
        Hans de Goede <hdegoede@...hat.com>,
        "John W. Linville" <linville@...driver.com>,
        "brian m. carlson" <sandals@...stytoothpaste.net>,
        Andy Shevchenko <andy.shevchenko@...il.com>,
        linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-acpi@...r.kernel.org, brcm80211-dev-list.pdl@...adcom.com,
        SHA-cyfmac-dev-list@...ineon.com
Subject: Re: [PATCH v2 06/35] brcmfmac: firmware: Support passing in multiple
 board_types

On 1/4/2022 8:26 AM, Hector Martin wrote:
> In order to make use of the multiple alt_path functionality, change
> board_type to an array. Bus drivers can pass in a NULL-terminated list
> of board type strings to try for the firmware fetch.
> 
> Acked-by: Linus Walleij <linus.walleij@...aro.org>
> Signed-off-by: Hector Martin <marcan@...can.st>
> ---
>   .../broadcom/brcm80211/brcmfmac/firmware.c    | 35 ++++++++++++-------
>   .../broadcom/brcm80211/brcmfmac/firmware.h    |  2 +-
>   .../broadcom/brcm80211/brcmfmac/pcie.c        |  4 ++-
>   .../broadcom/brcm80211/brcmfmac/sdio.c        |  2 +-
>   4 files changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
> index 7570dbf22cdd..054ea3ed133e 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
> @@ -594,28 +594,39 @@ static int brcmf_fw_complete_request(const struct firmware *fw,
>   	return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret;
>   }
>   
> -static int brcm_alt_fw_paths(const char *path, const char *board_type,
> +static int brcm_alt_fw_paths(const char *path, struct brcmf_fw *fwctx,
>   			     const char *alt_paths[BRCMF_FW_MAX_ALT_PATHS])
>   {
> +	const char **board_types = fwctx->req->board_types;
> +	unsigned int i;
>   	char alt_path[BRCMF_FW_NAME_LEN];
>   	const char *suffix;
>   
>   	memset(alt_paths, 0, array_size(sizeof(*alt_paths),
>   					BRCMF_FW_MAX_ALT_PATHS));
>   
> +	if (!board_types[0])
> +		return -ENOENT;
> +
>   	suffix = strrchr(path, '.');
>   	if (!suffix || suffix == path)
>   		return -EINVAL;
>   
> -	/* strip extension at the end */
> -	strscpy(alt_path, path, BRCMF_FW_NAME_LEN);
> -	alt_path[suffix - path] = 0;
> +	for (i = 0; i < BRCMF_FW_MAX_ALT_PATHS; i++) {
> +		if (!board_types[i])
> +		    break;

Indentation error

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