linux-kernel - Re: [PATCH AUTOSEL 5.3 20/49] firmware: bcm47xx_nvram: Correct size

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: <feb780d4-c9f7-b662-729c-babd361b223e@gmail.com>
Date:   Sun, 29 Sep 2019 12:39:05 -0700
From:   Florian Fainelli <f.fainelli@...il.com>
To:     Sasha Levin <sashal@...nel.org>, linux-kernel@...r.kernel.org,
        stable@...r.kernel.org
Cc:     Philippe Mathieu-Daudé <f4bug@...at.org>,
        Paul Burton <paul.burton@...s.com>, linux-mips@...ux-mips.org,
        joe@...ches.com,
        Rafał Miłecki <zajec5@...il.com>,
        linux-mips@...r.kernel.org
Subject: Re: [PATCH AUTOSEL 5.3 20/49] firmware: bcm47xx_nvram: Correct size_t
 printf format



On 9/29/2019 10:30 AM, Sasha Levin wrote:
> From: Florian Fainelli <f.fainelli@...il.com>
> 
> [ Upstream commit feb4eb060c3aecc3c5076bebe699cd09f1133c41 ]
> 
> When building on a 64-bit host, we will get warnings like those:
> 
> drivers/firmware/broadcom/bcm47xx_nvram.c:103:3: note: in expansion of macro 'pr_err'
>    pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
>    ^~~~~~
> drivers/firmware/broadcom/bcm47xx_nvram.c:103:28: note: format string is defined here
>    pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
>                            ~^
>                            %li
> 
> Use %zu instead for that purpose.

This is not a fix that should be backported as it was done only to allow
the driver to the made buildable with COMPILE_TEST. Please drop it from
your auto-selection.

> 
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@...at.org>
> Signed-off-by: Paul Burton <paul.burton@...s.com>
> Cc: linux-mips@...ux-mips.org
> Cc: joe@...ches.com
> Cc: Rafał Miłecki <zajec5@...il.com>
> Cc: linux-mips@...r.kernel.org
> Cc: linux-kernel@...r.kernel.org
> Signed-off-by: Sasha Levin <sashal@...nel.org>
> ---
>  drivers/firmware/broadcom/bcm47xx_nvram.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
> index 77eb74666ecbc..6d2820f6aca13 100644
> --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
> +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
> @@ -96,7 +96,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
>  		nvram_len = size;
>  	}
>  	if (nvram_len >= NVRAM_SPACE) {
> -		pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
> +		pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
>  		       nvram_len, NVRAM_SPACE - 1);
>  		nvram_len = NVRAM_SPACE - 1;
>  	}
> @@ -148,7 +148,7 @@ static int nvram_init(void)
>  	    header.len > sizeof(header)) {
>  		nvram_len = header.len;
>  		if (nvram_len >= NVRAM_SPACE) {
> -			pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
> +			pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
>  				header.len, NVRAM_SPACE);
>  			nvram_len = NVRAM_SPACE - 1;
>  		}
> 

-- 
Florian