| From 0b41a48b242eeeadeca7322c668edc5be814db73 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 29 Sep 2021 15:02:18 -0700 |
| Subject: leaking_addresses: Always print a trailing newline |
| |
| 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 b2d8b8aa2d99e..8f636a23bc3f2 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; |
| -- |
| 2.33.0 |
| |
