netdev - Re: [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing

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:   Thu, 21 Dec 2017 17:42:16 +0100
From:   Hauke Mehrtens <hauke@...ke-m.de>
To:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Rafał Miłecki <zajec5@...il.com>,
        linux-mips@...ux-mips.org,
        "David S . Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH v2] FIRMWARE: bcm47xx_nvram: Replace mac address parsing



On 12/21/2017 03:40 PM, Andy Shevchenko wrote:
> Replace sscanf() with mac_pton().
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>

Acked-by: Hauke Mehrtens <hauke@...ke-m.de>

The patch looks good, but I haven't tested them on my devices.

> ---
> - use negative condition to be consistent with the rest code
>  drivers/firmware/broadcom/Kconfig         |  1 +
>  drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +++---------------
>  2 files changed, 4 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/firmware/broadcom/Kconfig b/drivers/firmware/broadcom/Kconfig
> index 5e29f83e7b39..c041dcb7ea52 100644
> --- a/drivers/firmware/broadcom/Kconfig
> +++ b/drivers/firmware/broadcom/Kconfig
> @@ -13,6 +13,7 @@ config BCM47XX_NVRAM
>  config BCM47XX_SPROM
>  	bool "Broadcom SPROM driver"
>  	depends on BCM47XX_NVRAM
> +	select GENERIC_NET_UTILS
>  	help
>  	  Broadcom devices store configuration data in SPROM. Accessing it is
>  	  specific to the bus host type, e.g. PCI(e) devices have it mapped in
> diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c b/drivers/firmware/broadcom/bcm47xx_sprom.c
> index 62aa3cf09b4d..4787f86c8ac1 100644
> --- a/drivers/firmware/broadcom/bcm47xx_sprom.c
> +++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
> @@ -137,20 +137,6 @@ static void nvram_read_leddc(const char *prefix, const char *name,
>  	*leddc_off_time = (val >> 16) & 0xff;
>  }
>  
> -static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])
> -{
> -	if (strchr(buf, ':'))
> -		sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
> -			&macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
> -			&macaddr[5]);
> -	else if (strchr(buf, '-'))
> -		sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0],
> -			&macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
> -			&macaddr[5]);
> -	else
> -		pr_warn("Can not parse mac address: %s\n", buf);
> -}
> -
>  static void nvram_read_macaddr(const char *prefix, const char *name,
>  			       u8 val[6], bool fallback)
>  {
> @@ -161,7 +147,9 @@ static void nvram_read_macaddr(const char *prefix, const char *name,
>  	if (err < 0)
>  		return;
>  
> -	bcm47xx_nvram_parse_macaddr(buf, val);
> +	strreplace(buf, '-', ':');
> +	if (!mac_pton(buf, val))
> +		pr_warn("Can not parse mac address: %s\n", buf);
>  }
>  
>  static void nvram_read_alpha2(const char *prefix, const char *name,
>