Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 052c0f90 authored by Jiri Olsa's avatar Jiri Olsa Committed by Greg Kroah-Hartman
Browse files

perf tools: Fix snprint warnings for gcc 8 



commit 77f18153c080855e1c3fb520ca31a4e61530121d upstream.

[Add an additional sprintf replacement in tools/perf/builtin-script.c]

With gcc 8 we get new set of snprintf() warnings that breaks the
compilation, one example:

  tests/mem.c: In function ‘check’:
  tests/mem.c:19:48: error: ‘%s’ directive output may be truncated writing \
        up to 99 bytes into a region of size 89 [-Werror=format-truncation=]
    snprintf(failure, sizeof failure, "unexpected %s", out);

The gcc docs says:

 To avoid the warning either use a bigger buffer or handle the
 function's return value which indicates whether or not its output
 has been truncated.

Given that all these warnings are harmless, because the code either
properly fails due to uncomplete file path or we don't care for
truncated output at all, I'm changing all those snprintf() calls to
scnprintf(), which actually 'checks' for the snprint return value so the
gcc stays silent.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Link: http://lkml.kernel.org/r/20180319082902.4518-1-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3140af4e

tools/perf/builtin-script.c

+12 −12
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static int is_directory(const char *base_path, const struct dirent *dent) 
	char path[PATH_MAX];

	struct stat st;



	sprintf(path, "%s/%s", base_path, dent->d_name);

	scnprintf(path, PATH_MAX, "%s/%s", base_path, dent->d_name);

	if (stat(path, &st))

		return 0;
@@ -1426,7 +1426,7 @@ static int list_available_scripts(const struct option *opt __maybe_unused, 
		return -1;



	for_each_lang(scripts_path, scripts_dir, lang_dirent) {

		snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,

		scnprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,

			  lang_dirent->d_name);

		lang_dir = opendir(lang_path);

		if (!lang_dir)
@@ -1436,7 +1436,7 @@ static int list_available_scripts(const struct option *opt __maybe_unused, 
			script_root = get_script_root(script_dirent, REPORT_SUFFIX);

			if (script_root) {

				desc = script_desc__findnew(script_root);

				snprintf(script_path, MAXPATHLEN, "%s/%s",

				scnprintf(script_path, MAXPATHLEN, "%s/%s",

					  lang_path, script_dirent->d_name);

				read_script_info(desc, script_path);

				free(script_root);
@@ -1473,7 +1473,7 @@ static int check_ev_match(char *dir_name, char *scriptname, 
	int match, len;

	FILE *fp;



	sprintf(filename, "%s/bin/%s-record", dir_name, scriptname);

	scnprintf(filename, MAXPATHLEN, "%s/bin/%s-record", dir_name, scriptname);



	fp = fopen(filename, "r");

	if (!fp)
@@ -1549,7 +1549,7 @@ int find_scripts(char **scripts_array, char **scripts_path_array) 
	}



	for_each_lang(scripts_path, scripts_dir, lang_dirent) {

		snprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path,

		scnprintf(lang_path, MAXPATHLEN, "%s/%s", scripts_path,

			  lang_dirent->d_name);

#ifdef NO_LIBPERL

		if (strstr(lang_path, "perl"))
@@ -1605,7 +1605,7 @@ static char *get_script_path(const char *script_root, const char *suffix) 
		return NULL;



	for_each_lang(scripts_path, scripts_dir, lang_dirent) {

		snprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,

		scnprintf(lang_path, MAXPATHLEN, "%s/%s/bin", scripts_path,

			  lang_dirent->d_name);

		lang_dir = opendir(lang_path);

		if (!lang_dir)
@@ -1617,7 +1617,7 @@ static char *get_script_path(const char *script_root, const char *suffix) 
				free(__script_root);

				closedir(lang_dir);

				closedir(scripts_dir);

				snprintf(script_path, MAXPATHLEN, "%s/%s",

				scnprintf(script_path, MAXPATHLEN, "%s/%s",

					  lang_path, script_dirent->d_name);

				return strdup(script_path);

			}

tools/perf/tests/attr.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int run_dir(const char *d, const char *perf) 
	if (verbose)

		vcnt++;



	snprintf(cmd, 3*PATH_MAX, PYTHON " %s/attr.py -d %s/attr/ -p %s %.*s",

	scnprintf(cmd, 3*PATH_MAX, PYTHON " %s/attr.py -d %s/attr/ -p %s %.*s",

		  d, d, perf, vcnt, v);



	return system(cmd) ? TEST_FAIL : TEST_OK;

tools/perf/tests/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static char *test_format_dir_get(void) 
		struct test_format *format = &test_formats[i];

		FILE *file;



		snprintf(name, PATH_MAX, "%s/%s", dir, format->name);

		scnprintf(name, PATH_MAX, "%s/%s", dir, format->name);



		file = fopen(name, "w");

		if (!file)

tools/perf/util/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int open_cgroup(char *name) 
	if (cgroupfs_find_mountpoint(mnt, PATH_MAX + 1))

		return -1;



	snprintf(path, PATH_MAX, "%s/%s", mnt, name);

	scnprintf(path, PATH_MAX, "%s/%s", mnt, name);



	fd = open(path, O_RDONLY);

	if (fd == -1)

tools/perf/util/parse-events.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config) 


		for_each_event(sys_dirent, evt_dir, evt_dirent) {



			snprintf(evt_path, MAXPATHLEN, "%s/%s/id", dir_path,

			scnprintf(evt_path, MAXPATHLEN, "%s/%s/id", dir_path,

				  evt_dirent->d_name);

			fd = open(evt_path, O_RDONLY);

			if (fd < 0)