Commit e82d2af5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-tools-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing tool fix from Steven Rostedt:
 "Fix printf format warnings in latency-collector.

  Use the printf format string with %s to take a string instead of
  taking in a string directly"

* tag 'trace-tools-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tools/latency-collector: Fix -Wformat-security compile warns
parents d6a326d6 df73757c
...@@ -935,12 +935,12 @@ static void show_available(void) ...@@ -935,12 +935,12 @@ static void show_available(void)
} }
if (!tracers) { if (!tracers) {
warnx(no_tracer_msg); warnx("%s", no_tracer_msg);
return; return;
} }
if (!found) { if (!found) {
warnx(no_latency_tr_msg); warnx("%s", no_latency_tr_msg);
tracefs_list_free(tracers); tracefs_list_free(tracers);
return; return;
} }
...@@ -983,7 +983,7 @@ static const char *find_default_tracer(void) ...@@ -983,7 +983,7 @@ static const char *find_default_tracer(void)
for (i = 0; relevant_tracers[i]; i++) { for (i = 0; relevant_tracers[i]; i++) {
valid = tracer_valid(relevant_tracers[i], &notracer); valid = tracer_valid(relevant_tracers[i], &notracer);
if (notracer) if (notracer)
errx(EXIT_FAILURE, no_tracer_msg); errx(EXIT_FAILURE, "%s", no_tracer_msg);
if (valid) if (valid)
return relevant_tracers[i]; return relevant_tracers[i];
} }
...@@ -1878,7 +1878,7 @@ static void scan_arguments(int argc, char *argv[]) ...@@ -1878,7 +1878,7 @@ static void scan_arguments(int argc, char *argv[])
} }
valid = tracer_valid(current_tracer, &notracer); valid = tracer_valid(current_tracer, &notracer);
if (notracer) if (notracer)
errx(EXIT_FAILURE, no_tracer_msg); errx(EXIT_FAILURE, "%s", no_tracer_msg);
if (!valid) if (!valid)
errx(EXIT_FAILURE, errx(EXIT_FAILURE,
"The tracer %s is not supported by your kernel!\n", current_tracer); "The tracer %s is not supported by your kernel!\n", current_tracer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment