From patchwork Wed Oct 24 12:51:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 10654621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 700BA17E2 for ; Wed, 24 Oct 2018 12:51:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F45E2A77C for ; Wed, 24 Oct 2018 12:51:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5210E2A76C; Wed, 24 Oct 2018 12:51:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B77832A77C for ; Wed, 24 Oct 2018 12:51:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B40136B0288; Wed, 24 Oct 2018 08:51:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AED346B028B; Wed, 24 Oct 2018 08:51:33 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B4126B028C; Wed, 24 Oct 2018 08:51:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 5C7116B0288 for ; Wed, 24 Oct 2018 08:51:33 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id z10-v6so3275496pfd.5 for ; Wed, 24 Oct 2018 05:51:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6P5mpgfHnxoW8AFvc5Fz1NrbxyV8PgnIyF9q7AJ04yA=; b=Yaq7XOkwhQddZbTUGX2xtn88VpwhMQTPfHl+NXdokKAdxn+tFODx7AbhKawObfku0t gt+66bkln+Hk+U6lzx+8LwE55fzi2hGkzgJ9szPpj94nfm4jNHWq9Y+6ixVmModNFNmx ZweYY8vB1GrZ7a2IKpxJK0KxvX7Rdm69El0I5rbxg+hSRtBZRGOc8snSjkS2z1kWpplO 9DeNIZZOCzGp8Xxwh8DeFkS+7CFMGBFPD665Ohz6kpclQDlQXKn6V6jthMtes6bh5/bV uTMbhYuAjaZEx5nNnpgSschJzDTjGRa0DIV0Vh+tK9rlZaWPIaJfiH7DQnzLfbyyQDqd Eflg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AGRZ1gLwMqDYB3rdhqCqmSGiQf8Y5xsHimCQm1+QuXQTIGdh3BaWtauS V3BJW2PJJc59WnhooEp2i9XP7uE4nel7N5arrYG5pf6NgmRjd1XPQOUmCA4GjuSQgRaAVZBFoaX TiRLiNCyTGUUr7al7iDuPxJJMw0Tz36N7eOxVgDRE4jkzO+1W46WLFDjaZL+4bULiKQ== X-Received: by 2002:a65:4103:: with SMTP id w3-v6mr2467392pgp.284.1540385493026; Wed, 24 Oct 2018 05:51:33 -0700 (PDT) X-Google-Smtp-Source: AJdET5fXtSSd4Vdh8heNumdFiKHx46S34PEbL8nhCHPBR8LyNkOC3dmNuJ7/7BfFsCIJSMCPqwfC X-Received: by 2002:a65:4103:: with SMTP id w3-v6mr2467344pgp.284.1540385491891; Wed, 24 Oct 2018 05:51:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540385491; cv=none; d=google.com; s=arc-20160816; b=CM0vj8EEkzKj/Fr7WZq+pBPV1hpBXjxi85y8Pycp1QeYglXE4jvpTT4YFRIZZUjuTe 5njKkCvQvNN1uyPyopvk3jDAsM7/+ljZXTjSyPpfyIsk0eEzT8rVmCSS2kcvhjLk743B tBBT+qTjV0FYEU8RyfMQd+lMNu9Kny7eKEnlsh9s8h2wHUiBdvuQ9C+MYfKxyiqJK/F9 caFWeLcw0Y5JKAtA7qgKNuGXhZZPAfWf32EtCgcVch2BDX2Q5n3iQXix7S7LA9xIYf7L lJ6TYsEm1W3b/CInZDfPNlwJhLi7jZjbs95UkQyYMic5CcC2iWIyJotf02S+dOcSpxKv KwgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=6P5mpgfHnxoW8AFvc5Fz1NrbxyV8PgnIyF9q7AJ04yA=; b=B8HxyWDbgjaiG1SkGsli0TwK4oDADOPy4GeHWqLTn2tfBZGcFLyHQcl7pYKyyHRqO0 y5iSwGbJQZ51evfwRlv4PxfE4p6Rahl2U6G1FimrRh2to62WDV3deMIQ3KNLD/MqC/U8 oK6m/ax8IMnccykZ0qx1oIqXnaResJD+pswpRib06SjQ05pTelA3/kwlfPcl16ksw7j+ zo+w4qpVlYqqRJ3me8TtEU+/Y82GKEkA4rO6IwdsQZDbvIlzTgi6Gd2ryZr3r9PpRWIh Fo5OrWCWnLSRoc+naXCHB/rykkLU7auTX8yTFkdJRFQJ8F13XthpWLiVQjkmtzilXaoe j3hQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id m9-v6si4621867pge.326.2018.10.24.05.51.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 05:51:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2018 05:51:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,420,1534834800"; d="scan'208";a="274050048" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 24 Oct 2018 05:51:27 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id C0193133; Wed, 24 Oct 2018 15:51:26 +0300 (EEST) From: "Kirill A. Shutemov" To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org Cc: boris.ostrovsky@oracle.com, jgross@suse.com, bhe@redhat.com, willy@infradead.org, x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv2 2/2] x86/ldt: Unmap PTEs for the slot before freeing LDT pages Date: Wed, 24 Oct 2018 15:51:12 +0300 Message-Id: <20181024125112.55999-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181024125112.55999-1-kirill.shutemov@linux.intel.com> References: <20181024125112.55999-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP modify_ldt(2) leaves old LDT mapped after we switch over to the new one. Memory for the old LDT gets freed and the pages can be re-used. Leaving the mapping in place can have security implications. The mapping is present in userspace copy of page tables and Meltdown-like attack can read these freed and possibly reused pages. It's relatively simple to fix: just unmap the old LDT and flush TLB before freeing LDT memory. We can now avoid flushing TLB on map_ldt_struct() as the slot is unmapped and flushed by unmap_ldt_struct() (or never mapped in the first place). The overhead of the change should be negligible. It shouldn't be a particularly hot path anyway. Signed-off-by: Kirill A. Shutemov Fixes: f55f0501cbf6 ("x86/pti: Put the LDT in its own PGD if PTI is on") --- arch/x86/kernel/ldt.c | 59 ++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index ab18e0884dc6..5dc8ed202fa8 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@ -199,14 +199,6 @@ static void sanity_check_ldt_mapping(struct mm_struct *mm) /* * If PTI is enabled, this maps the LDT into the kernelmode and * usermode tables for the given mm. - * - * There is no corresponding unmap function. Even if the LDT is freed, we - * leave the PTEs around until the slot is reused or the mm is destroyed. - * This is harmless: the LDT is always in ordinary memory, and no one will - * access the freed slot. - * - * If we wanted to unmap freed LDTs, we'd also need to do a flush to make - * it useful, and the flush would slow down modify_ldt(). */ static int map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) @@ -214,8 +206,7 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) unsigned long va; bool is_vmalloc; spinlock_t *ptl; - pgd_t *pgd; - int i; + int i, nr_pages; if (!static_cpu_has(X86_FEATURE_PTI)) return 0; @@ -229,16 +220,10 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) /* Check if the current mappings are sane */ sanity_check_ldt_mapping(mm); - /* - * Did we already have the top level entry allocated? We can't - * use pgd_none() for this because it doens't do anything on - * 4-level page table kernels. - */ - pgd = pgd_offset(mm, LDT_BASE_ADDR); - is_vmalloc = is_vmalloc_addr(ldt->entries); - for (i = 0; i * PAGE_SIZE < ldt->nr_entries * LDT_ENTRY_SIZE; i++) { + nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE); + for (i = 0; i < nr_pages; i++) { unsigned long offset = i << PAGE_SHIFT; const void *src = (char *)ldt->entries + offset; unsigned long pfn; @@ -272,13 +257,39 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) /* Propagate LDT mapping to the user page-table */ map_ldt_struct_to_user(mm); - va = (unsigned long)ldt_slot_va(slot); - flush_tlb_mm_range(mm, va, va + LDT_SLOT_STRIDE, PAGE_SHIFT, false); - ldt->slot = slot; return 0; } +static void +unmap_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt) +{ + unsigned long va; + int i, nr_pages; + + if (!ldt) + return; + + /* LDT map/unmap is only required for PTI */ + if (!static_cpu_has(X86_FEATURE_PTI)) + return; + + nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE); + for (i = 0; i < nr_pages; i++) { + unsigned long offset = i << PAGE_SHIFT; + pte_t *ptep; + spinlock_t *ptl; + + va = (unsigned long)ldt_slot_va(ldt->slot) + offset; + ptep = get_locked_pte(mm, va, &ptl); + pte_clear(mm, va, ptep); + pte_unmap_unlock(ptep, ptl); + } + + va = (unsigned long)ldt_slot_va(ldt->slot); + flush_tlb_mm_range(mm, va, va + nr_pages * PAGE_SIZE, 0, false); +} + #else /* !CONFIG_PAGE_TABLE_ISOLATION */ static int @@ -286,6 +297,11 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) { return 0; } + +static void +unmap_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt) +{ +} #endif /* CONFIG_PAGE_TABLE_ISOLATION */ static void free_ldt_pgtables(struct mm_struct *mm) @@ -524,6 +540,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode) } install_ldt(mm, new_ldt); + unmap_ldt_struct(mm, old_ldt); free_ldt_struct(old_ldt); error = 0;