diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-01-20 17:14:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-23 19:58:19 +0100 |
| commit | 314a028c1f49cf79e6b443e21a70f5243d7df21f (patch) | |
| tree | 461735e69d6535555f9592c7ef771f1c2a5e3969 /arch | |
| parent | f05431489fe654ba0df6fc8ab272a438bc702c62 (diff) | |
| download | linux-stable-314a028c1f49cf79e6b443e21a70f5243d7df21f.tar.gz linux-stable-314a028c1f49cf79e6b443e21a70f5243d7df21f.tar.bz2 linux-stable-314a028c1f49cf79e6b443e21a70f5243d7df21f.zip | |
x86: Use __nostackprotect for sme_encrypt_kernel
commit 91cfc88c66bf8ab95937606569670cf67fa73e09 upstream.
Commit bacf6b499e11 ("x86/mm: Use a struct to reduce parameters for SME
PGD mapping") moved some parameters into a structure.
The structure was large enough to trigger the stack protection canary in
sme_encrypt_kernel which doesn't work this early, causing reboots.
Mark sme_encrypt_kernel appropriately to not use the canary.
Fixes: bacf6b499e11 ("x86/mm: Use a struct to reduce parameters for SME PGD mapping")
Signed-off-by: Laura Abbott <labbott@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/mem_encrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index e110fab33ed4..48c03c74c7f4 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -487,7 +487,7 @@ static unsigned long __init sme_pgtable_calc(unsigned long len) return total; } -void __init sme_encrypt_kernel(struct boot_params *bp) +void __init __nostackprotector sme_encrypt_kernel(struct boot_params *bp) { unsigned long workarea_start, workarea_end, workarea_len; unsigned long execute_start, execute_end, execute_len; |