The following commit has been merged into the sched/core branch of tip: Commit-ID: cf2a85efdade117e2169d6e26641016cbbf03ef0 Gitweb: https://git.kernel.org/tip/cf2a85efdade117e2169d6e26641016cbbf03ef0 Author: Kees Cook <keescook@xxxxxxxxxxxx> AuthorDate: Wed, 29 Sep 2021 15:02:18 -07:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 15 Oct 2021 11:25:13 +02:00 leaking_addresses: Always print a trailing newline For files that lack trailing newlines and match a leaking address (e.g. wchan[1]), the leaking_addresses.pl report would run together with the next line, making things look corrupted. Unconditionally remove the newline on input, and write it back out on output. [1] https://lore.kernel.org/all/20210103142726.GC30643@xsang-OptiPlex-9020/ Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20211008111626.151570317@xxxxxxxxxxxxx --- scripts/leaking_addresses.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index b2d8b8a..8f636a2 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -455,8 +455,9 @@ sub parse_file open my $fh, "<", $file or return; while ( <$fh> ) { + chomp; if (may_leak_address($_)) { - print $file . ': ' . $_; + printf("$file: $_\n"); } } close $fh;
![]() |