Skip to content

Commit 4ea6097

Browse files
acmelgregkh
authored andcommitted
perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches
commit 77d02bd upstream. Noticed on a debian:experimental mips and mipsel cross build build environment: perfbuilder@ec265a086e9b:~$ mips-linux-gnu-gcc --version | head -1 mips-linux-gnu-gcc (Debian 10.2.1-3) 10.2.1 20201224 perfbuilder@ec265a086e9b:~$ CC /tmp/build/perf/util/map.o util/map.c: In function 'map__new': util/map.c:109:5: error: '%s' directive output may be truncated writing between 1 and 2147483645 bytes into a region of size 4096 [-Werror=format-truncation=] 109 | "%s/platforms/%s/arch-%s/usr/lib/%s", | ^~ In file included from /usr/mips-linux-gnu/include/stdio.h:867, from util/symbol.h:11, from util/map.c:2: /usr/mips-linux-gnu/include/bits/stdio2.h:67:10: note: '__builtin___snprintf_chk' output 32 or more bytes (assuming 4294967321) into a destination of size 4096 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 68 | __bos (__s), __fmt, __va_arg_pack ()); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Since we have the lenghts for what lands in that place, use it to give the compiler more info and make it happy. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d462247 commit 4ea6097

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

tools/perf/util/map.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
9393
if (!strncmp(filename, "/system/lib/", 12)) {
9494
char *ndk, *app;
9595
const char *arch;
96-
size_t ndk_length;
97-
size_t app_length;
96+
int ndk_length, app_length;
9897

9998
ndk = getenv("NDK_ROOT");
10099
app = getenv("APP_PLATFORM");
@@ -122,8 +121,8 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
122121
if (new_length > PATH_MAX)
123122
return false;
124123
snprintf(newfilename, new_length,
125-
"%s/platforms/%s/arch-%s/usr/lib/%s",
126-
ndk, app, arch, libname);
124+
"%.*s/platforms/%.*s/arch-%s/usr/lib/%s",
125+
ndk_length, ndk, app_length, app, arch, libname);
127126

128127
return true;
129128
}

0 commit comments

Comments
 (0)