From 9fa8457b34dfa6c20627e1c37d0a2e7e8746dabc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Sep 2018 22:26:35 +0200 Subject: [PATCH] drop a 3.18 patch --- queue-3.18/series | 1 - .../x86-kexec-allocate-8k-pgds-for-pti.patch | 82 ------------------- 2 files changed, 83 deletions(-) delete mode 100644 queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch diff --git a/queue-3.18/series b/queue-3.18/series index 4314f097345..5c854496912 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -48,7 +48,6 @@ ata-libahci-correct-setting-of-devslp-register.patch scsi-3ware-fix-return-0-on-the-error-path-of-probe.patch bluetooth-hidp-fix-handling-of-strncpy-for-hid-name-information.patch x86-mm-remove-in_nmi-warning-from-vmalloc_fault.patch -x86-kexec-allocate-8k-pgds-for-pti.patch gpio-ml-ioh-fix-buffer-underwrite-on-probe-error-path.patch net-mvneta-fix-mtu-change-on-port-without-link.patch net-dcb-for-wild-card-lookups-use-priority-1-not-0.patch diff --git a/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch b/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch deleted file mode 100644 index 76924003ab7..00000000000 --- a/queue-3.18/x86-kexec-allocate-8k-pgds-for-pti.patch +++ /dev/null @@ -1,82 +0,0 @@ -From foo@baz Mon Sep 17 11:45:57 CEST 2018 -From: Joerg Roedel -Date: Wed, 25 Jul 2018 17:48:03 +0200 -Subject: x86/kexec: Allocate 8k PGDs for PTI - -From: Joerg Roedel - -[ 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. - -Signed-off-by: Joerg Roedel -Signed-off-by: Thomas Gleixner -Tested-by: David H. Gutteridge -Cc: "H . Peter Anvin" -Cc: linux-mm@kvack.org -Cc: Linus Torvalds -Cc: Andy Lutomirski -Cc: Dave Hansen -Cc: Josh Poimboeuf -Cc: Juergen Gross -Cc: Peter Zijlstra -Cc: Borislav Petkov -Cc: Jiri Kosina -Cc: Boris Ostrovsky -Cc: Brian Gerst -Cc: David Laight -Cc: Denys Vlasenko -Cc: Eduardo Valentin -Cc: Greg KH -Cc: Will Deacon -Cc: aliguori@amazon.com -Cc: daniel.gruss@iaik.tugraz.at -Cc: hughd@google.com -Cc: keescook@google.com -Cc: Andrea Arcangeli -Cc: Waiman Long -Cc: Pavel Machek -Cc: Arnaldo Carvalho de Melo -Cc: Alexander Shishkin -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: joro@8bytes.org -Link: https://lkml.kernel.org/r/1532533683-5988-4-git-send-email-joro@8bytes.org -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/kernel/machine_kexec_32.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/arch/x86/kernel/machine_kexec_32.c -+++ b/arch/x86/kernel/machine_kexec_32.c -@@ -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_tabl - - static 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); -- 2.47.3