* [PATCH AUTOSEL 4.14 24/39] leaking_addresses: Always print a trailing newline
[not found] <20211109010649.1191041-1-sashal@kernel.org>
@ 2021-11-09 1:06 ` Sasha Levin
0 siblings, 0 replies; only message in thread
From: Sasha Levin @ 2021-11-09 1:06 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Kees Cook, Peter Zijlstra, Sasha Levin, me, tycho,
linux-hardening
From: Kees Cook <keescook@chromium.org>
[ 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>
---
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 2977371b29563..de5196c08943a 100755
--- a/scripts/leaking_addresses.pl
+++ b/scripts/leaking_addresses.pl
@@ -262,8 +262,9 @@ sub parse_file
open my $fh, "<", $file or return;
while ( <$fh> ) {
+ chomp;
if (may_leak_address($_)) {
- print $file . ': ' . $_;
+ printf("$file: $_\n");
}
}
close $fh;
--
2.33.0
^ permalink raw reply related [flat|nested] only message in thread