Patch "x86/kexec: Allocate 8k PGDs for PTI" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/kexec: Allocate 8k PGDs for PTI
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-kexec-allocate-8k-pgds-for-pti.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Sep 17 11:45:57 CEST 2018
From: Joerg Roedel <[email protected]>
Date: Wed, 25 Jul 2018 17:48:03 +0200
Subject: x86/kexec: Allocate 8k PGDs for PTI
From: Joerg Roedel <[email protected]>
[ Upstream commit ca38dc8f2724d101038b1205122c93a1c7f38f11 ]
Fuzzing the PTI-x86-32 code with trinity showed unhandled kernel paging request oops-messages that looked a lot like silent data corruption.
Lot's of debugging and testing lead to the kexec-32bit code, which is still allocating 4k PGDs when PTI is enabled. But since it uses native_set_pud() to build the page-table, it will unevitably call into __pti_set_user_pgtbl(), which writes beyond the allocated 4k page.
Use PGD_ALLOCATION_ORDER to allocate PGDs in the kexec code to fix the issue.
--- arch/x86/kernel/machine_kexec_32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/machine_kexec_32.c +3 -2
@@ -69,7 +69,7 @@ static void load_segments(void)static void machine_kexec_free_page_tables (struct kimage *image) { -free_page ((unsigned long )image->arch.pgd); +free_pages ((unsigned long )image->arch.pgd,PGD_ALLOCATION_ORDER ); image->arch.pgd =NULL ;#ifdef CONFIG_X86_PAE free_page ((unsigned long )image->arch.pmd0);
@@ -85,7 +85,8 @@ static void machine_kexec_free_page_tablstatic int machine_kexec_alloc_page_tables (struct kimage *image) { - image->arch.pgd = (pgd_t *)get_zeroed_page (GFP_KERNEL ); + image->arch.pgd = (pgd_t *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, +PGD_ALLOCATION_ORDER );#ifdef CONFIG_X86_PAE image->arch.pmd0 = (pmd_t *)get_zeroed_page (GFP_KERNEL ); image->arch.pmd1 = (pmd_t *)get_zeroed_page (GFP_KERNEL );
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch queue-3.18/x86-mm-remove-in_nmi-warning-from-vmalloc_fault.patch
Quoted 8 lines · On Mon, 17 Sep 2018, [email protected] wrote:
This is a note to let you know that I've just added the patch titled
x86/kexec: Allocate 8k PGDs for PTI
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
Quoted 6 lines
The filename of the patch is:
x86-kexec-allocate-8k-pgds-for-pti.patch
and it can be found in the queue-3.18 subdirectory.If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
I believe this commit is an example of the auto-selector being too eager, and this should not be in *any* of the stable trees. As the commit message indicates, it's a fix by Joerg for his PTI-x86-32 implementation - which has not been backported to any of the stable trees (yet), has it?
In several of the recent stable trees, I think this will not do any actual harm; but it looks as if it will prevent relevant x86-32 configs from building on 3.18 (I see no definition of PGD_ALLOCATION_ORDER in linux-3.18.y - you preferred not to have any PTI in that tree), and I haven't checked whether its definition in older backports will build correctly here or not.
Hugh
Quoted 91 lines
From foo@baz Mon Sep 17 11:45:57 CEST 2018
From: Joerg Roedel <[email protected]>
Date: Wed, 25 Jul 2018 17:48:03 +0200
Subject: x86/kexec: Allocate 8k PGDs for PTIFrom: Joerg Roedel <[email protected]>
[ Upstream commit
ca38dc8f2724d101038b1205122c93a1c7f38f11]Fuzzing the PTI-x86-32 code with trinity showed unhandled kernel paging request oops-messages that looked a lot like silent data corruption.
Lot's of debugging and testing lead to the kexec-32bit code, which is still allocating 4k PGDs when PTI is enabled. But since it uses
native_set_pud()to build the page-table, it will unevitably call into__pti_set_user_pgtbl(), which writes beyond the allocated 4k page.Use
PGD_ALLOCATION_ORDERto allocate PGDs in the kexec code to fix the issue.Signed-off-by Joerg Roedel <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Tested-by David H. Gutteridge <[email protected]>Cc "H . Peter Anvin" <[email protected]>Cc Linus Torvalds <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Dave Hansen <[email protected]>Cc Josh Poimboeuf <[email protected]>Cc Juergen Gross <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Borislav Petkov <[email protected]>Cc Jiri Kosina <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Brian Gerst <[email protected]>Cc David Laight <[email protected]>Cc Denys Vlasenko <[email protected]>Cc Eduardo Valentin <[email protected]>Cc Greg KH <[email protected]>Cc Will Deacon <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc Waiman Long <[email protected]>Cc Pavel Machek <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Sasha Levin <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/x86/kernel/machine_kexec_32.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/x86/kernel/machine_kexec_32.c +3
-2@@ -69,7 +69,7 @@ static void load_segments(void)static void machine_kexec_free_page_tables (struct kimage *image) { -free_page ((unsigned long )image->arch.pgd); +free_pages ((unsigned long )image->arch.pgd,PGD_ALLOCATION_ORDER ); image->arch.pgd =NULL ;#ifdef CONFIG_X86_PAE free_page ((unsigned long )image->arch.pmd0);@@ -85,7 +85,8 @@ static void machine_kexec_free_page_tablstatic int machine_kexec_alloc_page_tables (struct kimage *image) { - image->arch.pgd = (pgd_t *)get_zeroed_page (GFP_KERNEL ); + image->arch.pgd = (pgd_t *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, +PGD_ALLOCATION_ORDER );#ifdef CONFIG_X86_PAE image->arch.pmd0 = (pmd_t *)get_zeroed_page (GFP_KERNEL ); image->arch.pmd1 = (pmd_t *)get_zeroed_page (GFP_KERNEL );Patches currently in stable-queue which might be from [email protected] are
queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patchqueue-3.18/x86-mm-remove-in_nmi-warning-from-vmalloc_fault.patch
Greg KH
maintainerQuoted 22 lines · Hugh Dickins
Quoted 8 lines · On Mon, 17 Sep 2018, [email protected] wrote:
This is a note to let you know that I've just added the patch titled
x86/kexec: Allocate 8k PGDs for PTI
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summaryQuoted 6 lines
The filename of the patch is:
x86-kexec-allocate-8k-pgds-for-pti.patch
and it can be found in the queue-3.18 subdirectory.If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
I believe this commit is an example of the auto-selector being too eager, and this should not be in *any* of the stable trees. As the commit message indicates, it's a fix by Joerg for his PTI-x86-32 implementation - which has not been backported to any of the stable trees (yet), has it?
Quoted 6 lines
In several of the recent stable trees, I think this will not do any actual harm; but it looks as if it will prevent relevant x86-32 configs from building on 3.18 (I see no definition of
PGD_ALLOCATION_ORDERin linux-3.18.y - you preferred not to have any PTI in that tree), and I haven't checked whether its definition in older backports will build correctly here or not.
Ah, you are right, I just got a build failure report from the 4.4.y tree with this exact error.
Thanks for letting me know, I'll go drop this from all of the stable tree queues right now.
greg k-h
Quoted 6 lines · Hugh Dickins
In several of the recent stable trees, I think this will not do any actual harm; but it looks as if it will prevent relevant x86-32 configs from building on 3.18 (I see no definition of
PGD_ALLOCATION_ORDERin linux-3.18.y - you preferred not to have any PTI in that tree), and I haven't checked whether its definition in older backports will build correctly here or not.
Right, thanks for pointing that out. I should have added a Fixes:-tag to the patch to make clear what the fix it for, sorry for that.
Joerg