From: Sergei Trofimovich <slyfox@gentoo.org>
To: linux-kernel@vger.kernel.org
Cc: Sergei Trofimovich <slyfox@gentoo.org>,
Jakub Jelinek <jakub@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Michael Matz <matz@suse.de>,
x86@kernel.org
Subject: [PATCH v2] x86: fix early boot crash on gcc-10
Date: Sat, 28 Mar 2020 08:48:58 +0000 [thread overview]
Message-ID: <20200328084858.421444-1-slyfox@gentoo.org> (raw)
In-Reply-To: <20200326223501.GK11398@zn.tnic>
The change fixes boot failure on physical machine where kernel
is built with gcc-10 with stack protector enabled by default:
```
Kernel panic — not syncing: stack-protector: Kernel stack is corrupted in: start_secondary+0x191/0x1a0
CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.6.0-rc5—00235—gfffb08b37df9 #139
Hardware name: Gigabyte Technology Co., Ltd. To be filled by O.E.M./H77M—D3H, BIOS F12 11/14/2013
Call Trace:
dump_stack+0x71/0xa0
panic+0x107/0x2b8
? start_secondary+0x191/0x1a0
__stack_chk_fail+0x15/0x20
start_secondary+0x191/0x1a0
secondary_startup_64+0xa4/0xb0
-—-[ end Kernel panic — not syncing: stack—protector: Kernel stack is corrupted in: start_secondary+0x191
```
This happens because `start_secondary()` is responsible for setting
up initial stack canary value in `smpboot.c`, but nothing prevents
gcc from inserting stack canary into `start_secondary()` itself
before `boot_init_stack_canary()` call.
The fix inhibits stack canary check foa single `start_secondary()`
function.
Tested the change by successfully booting the machine.
A few similar crashes on VMs:
- https://bugzilla.redhat.com/show_bug.cgi?id=1796780
- http://rglinuxtech.com/?p=2694
CC: Jakub Jelinek <jakub@redhat.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: Borislav Petkov <bp@alien8.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Andy Lutomirski <luto@kernel.org>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Michael Matz <matz@suse.de>
CC: x86@kernel.org
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
arch/x86/kernel/smpboot.c | 5 ++++-
include/linux/compiler-gcc.h | 1 +
include/linux/compiler_types.h | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 69881b2d446c..99a4cb631a64 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -207,8 +207,11 @@ static int cpu0_logical_apicid;
static int enable_start_cpu0;
/*
* Activate a secondary processor.
+ *
+ * Note: 'boot_init_stack_canary' changes canary value. Omit
+ * stack protection to avoid canary check (and boot) failure.
*/
-static void notrace start_secondary(void *unused)
+static void __no_stack_protector notrace start_secondary(void *unused)
{
/*
* Don't put *anything* except direct CPU state initialization
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index d7ee4c6bad48..fb67c743138c 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -172,3 +172,4 @@
#endif
#define __no_fgcse __attribute__((optimize("-fno-gcse")))
+#define __no_stack_protector __attribute__((optimize("-fno-stack-protector")))
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 72393a8c1a6c..9d5de1ea0b03 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -212,6 +212,10 @@ struct ftrace_likely_data {
#define asm_inline asm
#endif
+#ifndef __no_stack_protector
+# define __no_stack_protector
+#endif
+
#ifndef __no_fgcse
# define __no_fgcse
#endif
--
2.26.0
next prev parent reply other threads:[~2020-03-28 8:49 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-14 16:44 [PATCH] x86: fix early boot crash on gcc-10 Sergei Trofimovich
2020-03-16 13:04 ` Peter Zijlstra
2020-03-16 13:26 ` Jakub Jelinek
2020-03-16 13:42 ` Peter Zijlstra
2020-03-16 17:54 ` Borislav Petkov
2020-03-16 18:03 ` Jakub Jelinek
2020-03-17 14:36 ` Borislav Petkov
2020-03-17 14:39 ` Jakub Jelinek
2020-03-17 14:49 ` Borislav Petkov
2020-03-17 16:35 ` David Laight
2020-03-25 13:31 ` Borislav Petkov
2020-03-26 21:54 ` Sergei Trofimovich
2020-03-26 22:35 ` Borislav Petkov
2020-03-28 8:48 ` Sergei Trofimovich [this message]
2020-04-13 14:15 ` [tip: x86/urgent] x86: Fix " tip-bot2 for Sergei Trofimovich
2020-04-13 16:35 ` [PATCH v2] x86: fix " Borislav Petkov
2020-04-14 13:50 ` Michael Matz
2020-04-15 7:48 ` Borislav Petkov
2020-04-15 14:53 ` Michael Matz
2020-04-15 22:19 ` Sergei Trofimovich
2020-04-17 7:57 ` Borislav Petkov
2020-04-17 8:07 ` Jakub Jelinek
2020-04-17 8:42 ` Borislav Petkov
2020-04-17 8:58 ` Jakub Jelinek
2020-04-17 9:09 ` Borislav Petkov
2020-04-17 18:15 ` Nick Desaulniers
2020-04-17 18:22 ` Nick Desaulniers
2020-04-17 19:06 ` Jakub Jelinek
2020-04-17 19:49 ` Nick Desaulniers
2020-04-17 19:53 ` Nick Desaulniers
2020-04-20 14:04 ` Michael Matz
2020-04-22 10:23 ` Borislav Petkov
2020-04-22 11:40 ` Peter Zijlstra
2020-04-22 13:49 ` Borislav Petkov
2020-04-22 13:55 ` Jakub Jelinek
2020-04-22 14:16 ` Martin Liška
2020-04-22 15:06 ` Michael Matz
2020-04-22 16:53 ` Borislav Petkov
2020-04-22 17:02 ` Jakub Jelinek
2020-04-22 18:47 ` Nick Desaulniers
2020-04-22 18:55 ` Nick Desaulniers
2020-04-22 19:21 ` Borislav Petkov
2020-04-22 21:05 ` Nick Desaulniers
2020-04-22 21:26 ` Borislav Petkov
2020-04-22 22:57 ` Nick Desaulniers
2020-04-23 12:53 ` Borislav Petkov
2020-04-23 16:12 ` [PATCH] x86: Fix early boot crash on gcc-10, next try Borislav Petkov
2020-04-23 17:30 ` Borislav Petkov
2020-04-23 18:02 ` Nick Desaulniers
2020-04-23 18:27 ` Borislav Petkov
2020-04-27 11:37 ` [tip: x86/build] x86/build: Check whether the compiler is sane tip-bot2 for Borislav Petkov
2020-04-23 19:40 ` [PATCH] x86: Fix early boot crash on gcc-10, next try Kees Cook
2020-04-25 1:46 ` Arvind Sankar
2020-04-25 8:57 ` Borislav Petkov
2020-04-25 11:09 ` Jürgen Groß
2020-04-25 15:04 ` Arvind Sankar
2020-04-25 17:31 ` Borislav Petkov
2020-04-25 17:52 ` Borislav Petkov
2020-04-27 17:07 ` David Laight
2020-04-25 18:37 ` Segher Boessenkool
2020-04-25 18:53 ` Borislav Petkov
2020-04-25 19:15 ` Segher Boessenkool
2020-04-25 22:17 ` Borislav Petkov
2020-04-25 22:25 ` Arvind Sankar
2020-04-17 10:38 ` [PATCH v2] x86: fix early boot crash on gcc-10 Peter Zijlstra
2020-04-18 13:12 ` David Laight
2020-04-17 10:41 ` Peter Zijlstra
2020-03-16 18:20 ` [PATCH] " Arvind Sankar
2020-03-16 18:54 ` Arvind Sankar
2020-03-16 19:53 ` Arvind Sankar
2020-03-16 20:08 ` Jakub Jelinek
2020-03-16 20:40 ` Arvind Sankar
2020-03-16 22:12 ` Sergei Trofimovich
2020-03-17 11:46 ` Jakub Jelinek
2020-03-17 18:10 ` Sergei Trofimovich
2020-03-16 18:22 ` Arvind Sankar
2020-03-26 23:16 ` [PATCH v2] " Sergei Trofimovich
2020-04-27 11:37 ` [tip: x86/build] x86: Fix early boot crash on gcc-10, next try tip-bot2 for Borislav Petkov
2020-05-15 11:20 ` [tip: x86/urgent] x86: Fix early boot crash on gcc-10, third try tip-bot2 for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200328084858.421444-1-slyfox@gentoo.org \
--to=slyfox@gentoo.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jakub@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=matz@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).