[PATCH] kernel/panic: Do not append newline to the stack protector panic string

[PATCH] kernel/panic: Do not append newline to the stack protector panic string

[Borislav Petkov]

From: Borislav Petkov <bp@suse.de>

... 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]  ]---

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
---
 kernel/panic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/panic.c b/kernel/panic.c
index 8b2e002d52eb..837a94b7024d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -631,7 +631,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);
-- 
2.19.0.271.gfe8321ec057f

Re: [PATCH] kernel/panic: Do not append newline to the stack protector panic string

[Kees Cook]

On Mon, Oct 8, 2018 at 1:29 PM, Borislav Petkov <bp@alien8.de> wrote:
> From: Borislav Petkov <bp@suse.de>
>
> ... 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]  ]---
>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

Acked-by: Kees Cook <keescook@chromium.org>

Andrew, can you take this?

-Kees

> ---
>  kernel/panic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/panic.c b/kernel/panic.c
> index 8b2e002d52eb..837a94b7024d 100644
> --- a/kernel/panic.c
> +++ b/kernel/panic.c
> @@ -631,7 +631,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);
> --
> 2.19.0.271.gfe8321ec057f
>



-- 
Kees Cook
Pixel Security