]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
kernel/panic.c: do not append newline to the stack protector panic string
authorBorislav Petkov <bp@suse.de>
Tue, 30 Oct 2018 22:07:13 +0000 (15:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 1 Dec 2019 08:17:10 +0000 (09:17 +0100)
[ Upstream commit 95c4fb78fb23081472465ca20d5d31c4b780ed82 ]

... because panic() itself already does this. Otherwise you have
line-broken trailer:

  [    1.836965] ---[ end Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: pgd_alloc+0x29e/0x2a0
  [    1.836965]  ]---

Link: http://lkml.kernel.org/r/20181008202901.7894-1-bp@alien8.de
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/panic.c

index 72e001e3753e34484cc6ff5c6afec2d6162528e2..8138a676fb7d1b4f59f82c18cebc8cecea3f3d59 100644 (file)
@@ -636,7 +636,7 @@ device_initcall(register_warn_debugfs);
  */
 __visible void __stack_chk_fail(void)
 {
-       panic("stack-protector: Kernel stack is corrupted in: %pB\n",
+       panic("stack-protector: Kernel stack is corrupted in: %pB",
                __builtin_return_address(0));
 }
 EXPORT_SYMBOL(__stack_chk_fail);