leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: nfp: Use scnprintf() for avoiding potential buffer overflow

Browse Source 
Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit.  Fix it by replacing with scnprintf().

Reviewed-by: Simon Horman <simon.horman@netronome.com>
Cc: "David S . Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: oss-drivers@netronome.com
To: netdev@vger.kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Takashi Iwai 2020-03-15 10:35:00 +01:00 committed by David S. Miller
parent 4a348601eb
commit 413ae546f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
View File

@ -616,7 +616,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
if (bar->iomem) { if (bar->iomem) {
int pf; int pf;
msg += snprintf(msg, end - msg, "0.0: General/MSI-X SRAM, "); msg += scnprintf(msg, end - msg, "0.0: General/MSI-X SRAM, ");
atomic_inc(&bar->refcnt); atomic_inc(&bar->refcnt);
bars_free--; bars_free--;
@ -661,7 +661,7 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
/* Configure, and lock, BAR0.1 for PCIe XPB (MSI-X PBA) */ /* Configure, and lock, BAR0.1 for PCIe XPB (MSI-X PBA) */
bar = &nfp->bar[1]; bar = &nfp->bar[1];
msg += snprintf(msg, end - msg, "0.1: PCIe XPB/MSI-X PBA, "); msg += scnprintf(msg, end - msg, "0.1: PCIe XPB/MSI-X PBA, ");
atomic_inc(&bar->refcnt); atomic_inc(&bar->refcnt);
bars_free--; bars_free--;
@ -680,8 +680,8 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
bar->iomem = ioremap(nfp_bar_resource_start(bar), bar->iomem = ioremap(nfp_bar_resource_start(bar),
nfp_bar_resource_len(bar)); nfp_bar_resource_len(bar));
if (bar->iomem) { if (bar->iomem) {
msg += snprintf(msg, end - msg, msg += scnprintf(msg, end - msg,
"0.%d: Explicit%d, ", 4 + i, i); "0.%d: Explicit%d, ", 4 + i, i);
atomic_inc(&bar->refcnt); atomic_inc(&bar->refcnt);
bars_free--; bars_free--;