From patchwork Tue Oct 23 16:31:57 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: 10653413 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 39A7414DE for ; Tue, 23 Oct 2018 16:32:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28F552A124 for ; Tue, 23 Oct 2018 16:32:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26F4C29FBD; Tue, 23 Oct 2018 16:32:16 +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 87BF62A11E for ; Tue, 23 Oct 2018 16:32:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B51E36B000C; Tue, 23 Oct 2018 12:32:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AAF7F6B0006; Tue, 23 Oct 2018 12:32:10 -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 976BF6B000A; Tue, 23 Oct 2018 12:32:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 45C266B0005 for ; Tue, 23 Oct 2018 12:32:10 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id s24-v6so919019plp.12 for ; Tue, 23 Oct 2018 09:32:10 -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=fDSmDmTUfiXnXqpbBEdoC/hjfC8AXNaBPt90jXxpoXE=; b=fZArxNcssn5NEtpXjINuAwRJA0RTlUqc/C8bF3e/EInKNHJr0I8Fd77aBk3A74zUwV zh9cdg1ZFzpU/Rhw+rhe+l+nk4uzE/5vMUGBkJicqttHPWICNq347ru+EUFObpoAqVpe oBrM7ayVmPOfgzF88GGBL8nWuDE5JxCVKWxt4cI61sKGlEuctp77vuEB9uX2bUx5qIGl rhpfQzn1ALce8H9TEycEJ7mziqT0LyvHCnRUdoJ8UN0quI4sIMhTjlSUkpnNrBV73j9W FQ23fxydFPOg/CeSWQ8ggpiCKRxwUsdF//2DXdPBdlwV4TOePsUOSrs4S3ALRXYXkTrP 3zAw== 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: ABuFfogOlIVMmEQfK1B7t03QM2a/eNKGHoMB7w1OrcSjyK1wuTX3EZfi 53DKLvxepzJ44GWR65LcwUAN9fN1EmHUe1I8oLV7KUZnNKIvixhtaUE+EXZgY2mXUlRLZbn/cKB ZDRZ7gjdUEIfIew6Y6J3DsZdqBQwDaDDxo5nddsuwfT2PljPFK9ahBzPCNxOLmWiB8A== X-Received: by 2002:a63:3747:: with SMTP id g7-v6mr48706813pgn.59.1540312329866; Tue, 23 Oct 2018 09:32:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV62m8c6rU+NT6cmikdgnxjqPYKlzzVbqCEbFRdVOP0AkdYvZ71659PK0+E+AtiFE/k9qHtTp X-Received: by 2002:a63:3747:: with SMTP id g7-v6mr48706731pgn.59.1540312328751; Tue, 23 Oct 2018 09:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540312328; cv=none; d=google.com; s=arc-20160816; b=HM6GWXXVZ+iWyIEbU8yxl9hC5GKbWGf+nGiV/ajmWhQ0wEyuTe+eKkvapRuOHgs2qB 4ZPpEuThIB9v7EX8oI+ECcV+nYfnjyCeR12mbh5JqmeP3d+ToWuXMT3X48/tx2/TdtvJ EZ5hsh/nSBeXmJ/zIVT/jANt+C2iyTpE5j8/xRvPOwy26GIW/FtaNX23QI0P3QJXfCyU f1KLvlr+cI7hL7U/9NB3GsYeP4MRYlTHwdMBGjPUS7ISJwDeAKfCEimJ2CWqHXN0aGOW J6mRlb37T3LBc6C/hsvHBUW5AA/wTFFsI3gvWvEaqIpusKbcA/IzqRD8ubMnR7D+Vs7l Zhvw== 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=fDSmDmTUfiXnXqpbBEdoC/hjfC8AXNaBPt90jXxpoXE=; b=b6Zo3gdubWP8q0aC6QV2IkMJUeGBSNDU7zTKDM/tP8N7eWFXvIlSJhQ7qmK4COIvS+ bB5+v46KJqsLRHUqIn6E/QbjNTiWKITuF1CcId/fqErbA7WTHf/VNcSAp1/r14E0/1gH 2XCPQ1GxlAmmtTQ01YAwZ04amJe03SQua+K2nKsqD95nsKslPTWvOxtAu0ln4zIornJk WYOFJfQjtmczDUyoVm8N2IsSs34TEbGXayNbmObQu4vt1SagOjhjaK//RVpooF6l650x kh5ahkSD5HrJksjm7/0H+ixnct/UBnnzwchR7l4yAIvo2ZZdjqk/ZCT0nesAE7gZYHy5 l91Q== 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 w16-v6si1573668ply.155.2018.10.23.09.32.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 09:32:08 -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 fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Oct 2018 09:32:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,416,1534834800"; d="scan'208";a="97862347" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 23 Oct 2018 09:32:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 5074827D; Tue, 23 Oct 2018 19:32:04 +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: x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 2/2] x86/ldt: Unmap PTEs for the slow before freeing LDT Date: Tue, 23 Oct 2018 19:31:57 +0300 Message-Id: <20181023163157.41441-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181023163157.41441-1-kirill.shutemov@linux.intel.com> References: <20181023163157.41441-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 733e6ace0fa4..8767fea41309 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, 0); - 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); +} + #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;