Patch "perf bench numa: Avoid possible truncation when using snprintf()" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
perf bench numa: Avoid possible truncation when using snprintf()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-bench-numa-avoid-possible-truncation-when-using-snprintf.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
3aff8ba0a4c9c9191bb788171a1c54778e1246a2Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 9 Feb 2017 14:39:42 -0300
Subject: perf bench numa: Avoid possible truncation when using snprintf()
From: Arnaldo Carvalho de Melo <[email protected]>
commit 3aff8ba0a4c9c9191bb788171a1c54778e1246a2 upstream.
Addressing this warning from gcc 7:
CC /tmp/build/perf/bench/numa.o
bench/numa.c: In function '__bench_numa':
bench/numa.c:1582:42: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size between 8 and 17 [-Werror=format-truncation=]
snprintf(tname, 32, "process%d:thread%d", p, t);
^~
bench/numa.c:1582:25: note: directive argument in the range [0, 2147483647]
snprintf(tname, 32, "process%d:thread%d", p, t);
^~~~~~~~~~~~~~~~~~~~
In file included from /usr/include/stdio.h:939:0,
from bench/../util/util.h:47,
from bench/../builtin.h:4,
from bench/numa.c:11:
/usr/include/bits/stdio2.h:64:10: note: '__builtin___snprintf_chk' output between 17 and 35 bytes into a destination of size 32
return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
__bos (__s), __fmt, __va_arg_pack ());
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
--- tools/perf/bench/numa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/bench/numa.c +3 -3
@@ -1570,13 +1570,13 @@ static int __bench_numa(const char *name "GB/sec,", "total-speed", "GB/sec total speed");if (g->p.show_details >=2 ) { -char tname[32 ]; +char tname[14 +2 *10 +1 ];struct thread_data *td;for (p =0 ; p < g->p.nr_proc; p++) {for (t =0 ; t < g->p.nr_threads; t++) { -memset (tname,0 ,32 ); +memset (tname,0 ,sizeof (tname)); td = g->threads + p*g->p.nr_threads + t; -snprintf (tname,32 ,"process%d:thread%d" , p, t); +snprintf (tname,sizeof (tname),"process%d:thread%d" , p, t);print_res (tname, td->speed_gbs,"GB/sec" ,"thread-speed" ,"GB/sec/thread speed" ); print_res(tname, td->system_time_ns / 1e9,
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/perf-thread_map-correctly-size-buffer-used-with-dirent-dt_name.patch queue-4.4/perf-tests-remove-wrong-semicolon-in-while-loop-in-cqm-test.patch queue-4.4/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing-focussed.patch queue-4.4/perf-tests-avoid-possible-truncation-with-dirent-d_name-snprintf.patch queue-4.4/perf-top-use-__fallthrough.patch queue-4.4/perf-scripting-perl-fix-compile-error-with-some-perl5-versions.patch queue-4.4/perf-bench-numa-avoid-possible-truncation-when-using-snprintf.patch queue-4.4/perf-tools-use-readdir-instead-of-deprecated-readdir_r-again.patch queue-4.4/perf-thread_map-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/perf-tools-remove-duplicate-const-qualifier.patch queue-4.4/tools-string-use-__fallthrough-in-perf_atoll.patch queue-4.4/perf-intel-pt-use-__fallthrough.patch queue-4.4/perf-script-use-readdir-instead-of-deprecated-readdir_r.patch queue-4.4/tools-include-add-a-__fallthrough-statement.patch queue-4.4/tools-strfilter-use-__fallthrough.patch queue-4.4/perf-dwarf-guard-x86_64-definitions-under-ifdef-else-clause.patch queue-4.4/perf-pmu-fix-misleadingly-indented-assignment-whitespace.patch queue-4.4/perf-trace-do-not-process-perf_record_lost-twice.patch