From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982AbeAJXgY (ORCPT + 1 other); Wed, 10 Jan 2018 18:36:24 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51633 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751561AbeAJXgW (ORCPT ); Wed, 10 Jan 2018 18:36:22 -0500 Date: Wed, 10 Jan 2018 15:34:04 -0800 From: tip-bot for Dave Hansen Message-ID: Cc: hpa@zytor.com, dave.hansen@linux.intel.com, tim.c.chen@linux.intel.com, mingo@kernel.org, jcm@redhat.com, linux-kernel@vger.kernel.org, aarcange@redhat.com, tglx@linutronix.de Reply-To: dave.hansen@linux.intel.com, hpa@zytor.com, tim.c.chen@linux.intel.com, mingo@kernel.org, jcm@redhat.com, aarcange@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <20180110224939.2695CD47@viggo.jf.intel.com> References: <20180110224939.2695CD47@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/pti: Make unpoison of pgd for trusted boot work for real Git-Commit-ID: 8a931d1e24bacf01f00a35d43bfe7917256c5c49 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 8a931d1e24bacf01f00a35d43bfe7917256c5c49 Gitweb: https://git.kernel.org/tip/8a931d1e24bacf01f00a35d43bfe7917256c5c49 Author: Dave Hansen AuthorDate: Wed, 10 Jan 2018 14:49:39 -0800 Committer: Thomas Gleixner CommitDate: Thu, 11 Jan 2018 00:30:25 +0100 x86/pti: Make unpoison of pgd for trusted boot work for real The inital fix for trusted boot and PTI potentially misses the pgd clearing if pud_alloc() sets a PGD. It probably works in *practice* because for two adjacent calls to map_tboot_page() that share a PGD entry, the first will clear NX, *then* allocate and set the PGD (without NX clear). The second call will *not* allocate but will clear the NX bit. Defer the NX clearing to a point after it is known that all top-level allocations have occurred. Add a comment to clarify why. [ tglx: Massaged changelog ] Fixes: 262b6b30087 ("x86/tboot: Unbreak tboot with PTI enabled") Signed-off-by: Dave Hansen Signed-off-by: Thomas Gleixner Reviewed-by: Andrea Arcangeli Cc: Jon Masters Cc: "Tim Chen" Cc: gnomes@lxorguk.ukuu.org.uk Cc: peterz@infradead.org Cc: ning.sun@intel.com Cc: tboot-devel@lists.sourceforge.net Cc: andi@firstfloor.org Cc: luto@kernel.org Cc: law@redhat.com Cc: pbonzini@redhat.com Cc: torvalds@linux-foundation.org Cc: gregkh@linux-foundation.org Cc: dwmw@amazon.co.uk Cc: nickc@redhat.com Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180110224939.2695CD47@viggo.jf.intel.com --- arch/x86/kernel/tboot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 75869a4..a2486f4 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -127,7 +127,6 @@ static int map_tboot_page(unsigned long vaddr, unsigned long pfn, p4d = p4d_alloc(&tboot_mm, pgd, vaddr); if (!p4d) return -1; - pgd->pgd &= ~_PAGE_NX; pud = pud_alloc(&tboot_mm, p4d, vaddr); if (!pud) return -1; @@ -139,6 +138,17 @@ static int map_tboot_page(unsigned long vaddr, unsigned long pfn, return -1; set_pte_at(&tboot_mm, vaddr, pte, pfn_pte(pfn, prot)); pte_unmap(pte); + + /* + * PTI poisons low addresses in the kernel page tables in the + * name of making them unusable for userspace. To execute + * code at such a low address, the poison must be cleared. + * + * Note: 'pgd' actually gets set in p4d_alloc() _or_ + * pud_alloc() depending on 4/5-level paging. + */ + pgd->pgd &= ~_PAGE_NX; + return 0; }