From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Lutomirski Subject: [PATCH v2 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Date: Fri, 17 Jun 2016 13:00:39 -0700 Message-ID: <3336bb02792d56c49d18e2f7a435fd194a4a22e4.1466192946.git.luto@kernel.org> References: Return-path: In-Reply-To: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, Borislav Petkov , Nadav Amit , Kees Cook , Brian Gerst , "kernel-hardening@lists.openwall.com" , Linus Torvalds , Josh Poimboeuf , Jann Horn , Heiko Carstens , Andy Lutomirski List-Id: linux-arch.vger.kernel.org It's currently only used in the EFI code, which is safe AFAICT. Warn if anyone tries to use it on the normal kernel pgd. Signed-off-by: Andy Lutomirski --- arch/x86/mm/pageattr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 6a8026918bf6..e9b9c5cedbb8 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1996,6 +1996,9 @@ out: void kernel_unmap_pages_in_pgd(pgd_t *root, unsigned long address, unsigned numpages) { + /* Unmapping kernel entries from init_mm's pgd is not allowed. */ + WARN_ON(root == init_mm.pgd); + unmap_pgd_range(root, address, address + (numpages << PAGE_SHIFT)); } -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:59092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbcFQUA6 (ORCPT ); Fri, 17 Jun 2016 16:00:58 -0400 From: Andy Lutomirski Subject: [PATCH v2 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Date: Fri, 17 Jun 2016 13:00:39 -0700 Message-ID: <3336bb02792d56c49d18e2f7a435fd194a4a22e4.1466192946.git.luto@kernel.org> In-Reply-To: References: In-Reply-To: References: Sender: linux-arch-owner@vger.kernel.org List-ID: To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, Borislav Petkov , Nadav Amit , Kees Cook , Brian Gerst , "kernel-hardening@lists.openwall.com" , Linus Torvalds , Josh Poimboeuf , Jann Horn , Heiko Carstens , Andy Lutomirski Message-ID: <20160617200039.tn7rf2nAyNpK1obTO8lutVEkbH7tfYRC9SpqoxukfCY@z> It's currently only used in the EFI code, which is safe AFAICT. Warn if anyone tries to use it on the normal kernel pgd. Signed-off-by: Andy Lutomirski --- arch/x86/mm/pageattr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 6a8026918bf6..e9b9c5cedbb8 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1996,6 +1996,9 @@ out: void kernel_unmap_pages_in_pgd(pgd_t *root, unsigned long address, unsigned numpages) { + /* Unmapping kernel entries from init_mm's pgd is not allowed. */ + WARN_ON(root == init_mm.pgd); + unmap_pgd_range(root, address, address + (numpages << PAGE_SHIFT)); } -- 2.5.5