* [PATCH] x86/efi: Free efi_pgd with free_pages()
@ 2018-03-22 19:18 Waiman Long
2018-03-23 19:21 ` [tip:x86/pti] " tip-bot for Waiman Long
0 siblings, 1 reply; 2+ messages in thread
From: Waiman Long @ 2018-03-22 19:18 UTC (permalink / raw)
To: Ard Biesheuvel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: x86, linux-efi, linux-kernel, Dave Hansen, Waiman Long
The efi_pgd is allocated as PGD_ALLOCATION_ORDER pages and so should
also be freed as PGD_ALLOCATION_ORDER pages with free_pages().
Fixes: d9e9a6418065 ("x86/mm/pti: Allocate a separate user PGD")
Signed-off-by: Waiman Long <longman@redhat.com>
---
arch/x86/platform/efi/efi_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index c310a82..f9cfbc0 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -227,7 +227,7 @@ int __init efi_alloc_page_tables(void)
if (!pud) {
if (CONFIG_PGTABLE_LEVELS > 4)
free_page((unsigned long) pgd_page_vaddr(*pgd));
- free_page((unsigned long)efi_pgd);
+ free_pages((unsigned long)efi_pgd, PGD_ALLOCATION_ORDER);
return -ENOMEM;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/pti] x86/efi: Free efi_pgd with free_pages()
2018-03-22 19:18 [PATCH] x86/efi: Free efi_pgd with free_pages() Waiman Long
@ 2018-03-23 19:21 ` tip-bot for Waiman Long
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Waiman Long @ 2018-03-23 19:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, dave.hansen, longman, tglx, mingo, hpa, ard.biesheuvel
Commit-ID: 06ace26f4e6fcf747e890a39193be811777a048a
Gitweb: https://git.kernel.org/tip/06ace26f4e6fcf747e890a39193be811777a048a
Author: Waiman Long <longman@redhat.com>
AuthorDate: Thu, 22 Mar 2018 15:18:53 -0400
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 23 Mar 2018 20:18:31 +0100
x86/efi: Free efi_pgd with free_pages()
The efi_pgd is allocated as PGD_ALLOCATION_ORDER pages and therefore must
also be freed as PGD_ALLOCATION_ORDER pages with free_pages().
Fixes: d9e9a6418065 ("x86/mm/pti: Allocate a separate user PGD")
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/1521746333-19593-1-git-send-email-longman@redhat.com
---
arch/x86/platform/efi/efi_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index c310a8284358..f9cfbc0d1f33 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -227,7 +227,7 @@ int __init efi_alloc_page_tables(void)
if (!pud) {
if (CONFIG_PGTABLE_LEVELS > 4)
free_page((unsigned long) pgd_page_vaddr(*pgd));
- free_page((unsigned long)efi_pgd);
+ free_pages((unsigned long)efi_pgd, PGD_ALLOCATION_ORDER);
return -ENOMEM;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-23 19:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-22 19:18 [PATCH] x86/efi: Free efi_pgd with free_pages() Waiman Long
2018-03-23 19:21 ` [tip:x86/pti] " tip-bot for Waiman Long
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.