summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2021-09-29 15:02:18 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-18 14:03:57 +0100
commite1d7f0202a9f038a59cc6ed954fdb4eba1324abe (patch)
treeb0c9e7f9d993dd6f039d00f22564b64605a20f54 /scripts
parent9101e2574b8153c80eb9056f86cfa4a853158f21 (diff)
downloadlinux-stable-e1d7f0202a9f038a59cc6ed954fdb4eba1324abe.tar.gz
linux-stable-e1d7f0202a9f038a59cc6ed954fdb4eba1324abe.tar.bz2
linux-stable-e1d7f0202a9f038a59cc6ed954fdb4eba1324abe.zip
leaking_addresses: Always print a trailing newline
[ Upstream commit cf2a85efdade117e2169d6e26641016cbbf03ef0 ] 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@chromium.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20211008111626.151570317@infradead.org Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/leaking_addresses.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
index b2d8b8aa2d99..8f636a23bc3f 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;