firmware: tegra: fix strncpy()/strncat() confusion
PATCH v2 1/1 firmware: tegra: fix strncpy()/strncat() confusion
From: Arnd Bergmann <[email protected]>
The way that bpmp_populate_debugfs_inband() uses strncpy() and strncat() makes no sense since the size argument for the first is insufficient to contain the trailing '/' and the second passes the length of the input rather than the output, which triggers a warning:
In function 'strncat',
inlined from 'bpmp_populate_debugfs_inband' at ../drivers/firmware/tegra/bpmp-debugfs.c:422:4:include/linux/string.h:289:30: warning: '__builtin_strncat' specified bound depends on the length of the source argument [-Wstringop-overflow=]
289 | #define __underlying_strncat __builtin_strncat
| ^include/linux/string.h:367:10: note: in expansion of macro '__underlying_strncat'
367 | return __underlying_strncat(p, q, count);
| ^~~~~~~~~~~~~~~~~~~~drivers/firmware/tegra/bpmp-debugfs.c: In function 'bpmp_populate_debugfs_inband':include/linux/string.h:288:29: note: length computed here
288 | #define __underlying_strlen __builtin_strlen
| ^include/linux/string.h:321:10: note: in expansion of macro '__underlying_strlen'
321 | return __underlying_strlen(p);
Simplify this to use an snprintf() instead.
---
v2: Use the correct arguments for snprintf(), as pointed out by Arvind Sankar
--- drivers/firmware/tegra/bpmp-debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/firmware/tegra/bpmp-debugfs.c +1 -5
@@ -412,16 +412,12 @@ static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, goto out; } - len =strlen (ppath) +strlen (name) +1 ; + len =snprintf (pathbuf, pathlen,"%s%s/" , ppath, name);if (len >= pathlen) { err = -EINVAL ; goto out; } -strncpy (pathbuf, ppath, pathlen); -strncat (pathbuf, name,strlen (name)); -strcat (pathbuf,"/" ); - err =bpmp_populate_debugfs_inband (bpmp, dentry, pathbuf);if (err <0 )
Signature · 1 line
2.27.0
Quoted 5 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The way that
bpmp_populate_debugfs_inband()usesstrncpy()andstrncat()makes no sense since the size argument for the first is insufficient to contain the trailing '/'
I don't believe that is the case, because there is a +1 for trailing '/' and the if statement is checking if the len is equal to or greater than. If it is equal then there is no room for the nul character and will fail. So it should not overflow.
Quoted 41 lines
and the second passes the length of the input rather than the output, which triggers a warning:
In function 'strncat',
inlined from 'bpmp_populate_debugfs_inband' at../drivers/firmware/tegra/bpmp-debugfs.c:422:4:include/linux/string.h:289:30: warning: '__builtin_strncat' specified bound depends on the length of the source argument [-Wstringop-overflow=]
289 | #define__underlying_strncat__builtin_strncat
| ^include/linux/string.h:367:10: note: in expansion of macro '__underlying_strncat'367 | return __underlying_strncat(p, q, count); | ^~~~~~~~~~~~~~~~~~~~
drivers/firmware/tegra/bpmp-debugfs.c: In function 'bpmp_populate_debugfs_inband':include/linux/string.h:288:29: note: length computed here
288 | #define__underlying_strlen__builtin_strlen
| ^include/linux/string.h:321:10: note: in expansion of macro '__underlying_strlen'
321 | return__underlying_strlen(p);Simplify this to use an
snprintf()instead.Fixes 5e37b9c137ee ("firmware: tegra: Add support for in-band debug")Signed-off-by Arnd Bergmann <[email protected]>---
v2: Use the correct arguments forsnprintf(), as pointed out by Arvind Sankar--- drivers/firmware/tegra/bpmp-debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/firmware/tegra/bpmp-debugfs.c +1
-1@@ -412,16 +412,12 @@ static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, goto out; } - len =strlen (ppath) +strlen (name) +1 ; + len =snprintf (pathbuf, pathlen,"%s%s/" , ppath, name);if (len >= pathlen) { err = -EINVAL ;
drivers/firmware/tegra/bpmp-debugfs.c static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, · line 423
Quoted 10 lines
drivers/firmware/tegra/bpmp-debugfs.c +0
-4goto out; } -strncpy (pathbuf, ppath, pathlen); -strncat (pathbuf, name,strlen (name)); -strcat (pathbuf,"/" ); - err =bpmp_populate_debugfs_inband (bpmp, dentry, pathbuf);if (err <0 )
However, this is indeed much better and so thanks for the simplification.
Cheers
Jon
Signature · 1 line
nvpublic
Thierry Reding
AppliedQuoted 25 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The way that
bpmp_populate_debugfs_inband()usesstrncpy()andstrncat()makes no sense since the size argument for the first is insufficient to contain the trailing '/' and the second passes the length of the input rather than the output, which triggers a warning:In function 'strncat',
inlined from 'bpmp_populate_debugfs_inband' at../drivers/firmware/tegra/bpmp-debugfs.c:422:4:include/linux/string.h:289:30: warning: '__builtin_strncat' specified bound depends on the length of the source argument [-Wstringop-overflow=]
289 | #define__underlying_strncat__builtin_strncat
| ^include/linux/string.h:367:10: note: in expansion of macro '__underlying_strncat'367 | return __underlying_strncat(p, q, count); | ^~~~~~~~~~~~~~~~~~~~
drivers/firmware/tegra/bpmp-debugfs.c: In function 'bpmp_populate_debugfs_inband':include/linux/string.h:288:29: note: length computed here
288 | #define__underlying_strlen__builtin_strlen
| ^include/linux/string.h:321:10: note: in expansion of macro '__underlying_strlen'
321 | return__underlying_strlen(p);Simplify this to use an
snprintf()instead.
Quoted 7 lines
Fixes 5e37b9c137ee ("firmware: tegra: Add support for in-band debug")Signed-off-by Arnd Bergmann <[email protected]>---
v2: Use the correct arguments forsnprintf(), as pointed out by Arvind Sankar--- drivers/firmware/tegra/bpmp-debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
Applied, thanks.
Thierry