firmware: tegra: fix strncpy()/strncat() confusion
PATCH 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.
--- 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 ("%s%s/" , pathlen, 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 36 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.Fixes 5e37b9c137ee ("firmware: tegra: Add support for in-band debug")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/firmware/tegra/bpmp-debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/firmware/tegra/bpmp-debugfs.c +0
-0
drivers/firmware/tegra/bpmp-debugfs.c static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, · line 415
Quoted 5 lines
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 ("%s%s/" , pathlen, ppath, name);
Didn't you get any warnings with this? It should be
len = snprintf(pathbuf, pathlen, "%s%s/", ppath, name);
right?
Quoted 15 lines
drivers/firmware/tegra/bpmp-debugfs.c +0
-4if (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 8 lines · Arvind Sankar
Quoted 8 lines
drivers/firmware/tegra/bpmp-debugfs.c +0
-0@@ -412,16 +412,12 @@ static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, goto out; }
Quoted 7 lines
drivers/firmware/tegra/bpmp-debugfs.c static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, · line 415
Quoted 2 lines
drivers/firmware/tegra/bpmp-debugfs.c +1
-1- len =strlen (ppath) +strlen (name) +1 ; + len =snprintf ("%s%s/" , pathlen, ppath, name);Didn't you get any warnings with this? It should be
len = snprintf(pathbuf, pathlen, "%s%s/", ppath, name);right?
Eek, I did get a warning about a different issue in that one-line change and fixed it up in the wrong way without testing again. Sorry about that.
I'll retest and resend.
Arnd
Quoted 17 lines · Arnd Bergmann
Quoted 8 lines · Arvind Sankar
Quoted 8 lines
drivers/firmware/tegra/bpmp-debugfs.c +0
-0@@ -412,16 +412,12 @@ static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, goto out; }Quoted 7 lines
drivers/firmware/tegra/bpmp-debugfs.c static int bpmp_populate_debugfs_inband(struct tegra_bpmp *bpmp, · line 415
Quoted 2 lines
drivers/firmware/tegra/bpmp-debugfs.c +1
-1- len =strlen (ppath) +strlen (name) +1 ; + len =snprintf ("%s%s/" , pathlen, ppath, name);Didn't you get any warnings with this? It should be
len = snprintf(pathbuf, pathlen, "%s%s/", ppath, name);right?
Quoted 2 lines
Eek, I did get a warning about a different issue in that one-line change and fixed it up in the wrong way without testing again. Sorry about that.
Actually it turns out that gcc did not warn about my broken version. The argument types are (roughly) correct and as the third argument is not a constant string it could not verify the format string. Maybe it should have complained about the constant string used as an output, but it doesn't seem to care about that.
Arnd