netdev - Re: [PATCH v2 2/2] brcmfmac: support parse country code map from DT

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]

Date:   Fri, 16 Apr 2021 08:00:45 +0200
From:   Arend Van Spriel <arend.vanspriel@...adcom.com>
To:     Shawn Guo <shawn.guo@...aro.org>, Kalle Valo <kvalo@...eaurora.org>
Cc:     Rob Herring <robh+dt@...nel.org>,
        Rafał Miłecki <rafal@...ecki.pl>,
        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>,
        Chung-hsien Hsu <chung-hsien.hsu@...ineon.com>,
        linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
        brcm80211-dev-list.pdl@...adcom.com,
        SHA-cyfmac-dev-list@...ineon.com
Subject: Re: [PATCH v2 2/2] brcmfmac: support parse country code map from DT

On 4/15/2021 12:47 PM, Shawn Guo wrote:
> With any regulatory domain requests coming from either user space or
> 802.11 IE (Information Element), the country is coded in ISO3166
> standard.  It needs to be translated to firmware country code and
> revision with the mapping info in settings->country_codes table.
> Support populate country_codes table by parsing the mapping from DT.
> 
> The BRCMF_BUSTYPE_SDIO bus_type check gets separated from general DT
> validation, so that country code can be handled as general part rather
> than SDIO bus specific one.

Had another look....

> Signed-off-by: Shawn Guo <shawn.guo@...aro.org>
> Reviewed-by: Arend van Spriel <arend.vanspriel@...adcom.com>
> ---
>   .../wireless/broadcom/brcm80211/brcmfmac/of.c | 57 ++++++++++++++++++-
>   1 file changed, 55 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index a7554265f95f..dd99ac3410e3 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -12,12 +12,59 @@
>   #include "common.h"
>   #include "of.h"
>   
> +static int brcmf_of_get_country_codes(struct device *dev,
> +				      struct brcmf_mp_device *settings)
> +{
> +	struct device_node *np = dev->of_node;
> +	struct brcmfmac_pd_cc_entry *cce;
> +	struct brcmfmac_pd_cc *cc;
> +	int count;
> +	int i;
> +
> +	count = of_property_count_strings(np, "brcm,ccode-map");
> +	if (count < 0) {
> +		/* The property is optional, so return success if it doesn't
> +		 * exist. Otherwise propagate the error code.
> +		 */
> +		return (count == -EINVAL) ? 0 : count;
> +	}
> +
> +	cc = devm_kzalloc(dev, sizeof(*cc) + count * sizeof(*cce), GFP_KERNEL);
> +	if (!cc)
> +		return -ENOMEM;
> +
> +	cc->table_size = count;
> +
> +	for (i = 0; i < count; i++) {
> +		const char *map;
> +
> +		cce = &cc->table[i];
> +
> +		if (of_property_read_string_index(np, "brcm,ccode-map",
> +						  i, &map))
> +			continue;
> +
> +		/* String format e.g. US-Q2-86 */
> +		if (sscanf(map, "%2c-%2c-%d", cce->iso3166, cce->cc,
> +			   &cce->rev) != 3)
> +			brcmf_err("failed to read country map %s\n", map);
> +		else
> +			brcmf_dbg(INFO, "%s-%s-%d", cce->iso3166, cce->cc,
> +				  cce->rev);

... and here you are missing terminating '\n' in format string.

Regards,
Arend

> +	}
> +
> +	settings->country_codes = cc;
> +
> +	return 0;
> +}
> +

-- 
This electronic communication and the information and any files transmitted 
with it, or attached to it, are confidential and are intended solely for 
the use of the individual or entity to whom it is addressed and may contain 
information that is confidential, legally privileged, protected by privacy 
laws, or otherwise restricted from disclosure to anyone else. If you are 
not the intended recipient or the person responsible for delivering the 
e-mail to the intended recipient, you are hereby notified that any use, 
copying, distributing, dissemination, forwarding, printing, or copying of 
this e-mail is strictly prohibited. If you received this e-mail in error, 
please return the e-mail to the sender, delete it from your computer, and 
destroy any printed copy of it.

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