From patchwork Fri Oct 26 12:28:55 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: 10657333 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 705E413A9 for ; Fri, 26 Oct 2018 12:29:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 635C62BF1D for ; Fri, 26 Oct 2018 12:29:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 577BA2BF3A; Fri, 26 Oct 2018 12:29:12 +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 AADE72BF1D for ; Fri, 26 Oct 2018 12:29:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 04D596B030F; Fri, 26 Oct 2018 08:29:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E01E06B030A; Fri, 26 Oct 2018 08:29:04 -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 CF0476B030E; Fri, 26 Oct 2018 08:29:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 8A5926B030A for ; Fri, 26 Oct 2018 08:29:04 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id 14-v6so545386pfk.22 for ; Fri, 26 Oct 2018 05:29:04 -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=7jK1Pu1OQaxoJuvJBSRzL9Yc+Hbr6sbTeuiVVOQGHpo=; b=D/k7yHRw2DYeHDvRpP+x380Wj141iXrlg0mP3XUzx0rtkyf3TpQY7hHCmUjA/7D7+7 XfwqhqttPlbfudGzgTIOxK22+KG5bZnfEXAEvP/03k4SAFOlYSmyN3xUuKRwcspO96AI YCD255CiqZOcC10kInjG/bhBXb5Ef/c36SGsOH1c9Jt8NQLt8tu52NYjoO87CAi3xOlG vMRibviSEOOlmXSfbVVR9qvlDCQaJUt1KgxLMfhhopx2MGeAxS2h19JDZ11GyaIs+GbQ JFC2OnV77Ljyvmn8a3M1bTKiAhxeYWNB6Y4QfCgO/QzcrHjV9I4dh4e9PWAeGfdRJXJo Dvqg== 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.115 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: AGRZ1gJ2H6DBv72gbZKN+TdReR2yswkEZPoK/XzZvpiMvPEZ4NgZE3zl Oz+qT6/8jixVGCK+O6+AyB11l40Xs3QFz/Ld8I1DOXqia1t00CIPqKyKm54NmLOxyPhAbdZqk+x oPObaKQJln2/OmOtip1qOYBWdBBotZtHEt2er2MQ7kIK+yIQc92Tyy23aHbnfiv9I7w== X-Received: by 2002:a62:d8c6:: with SMTP id e189-v6mr3602587pfg.23.1540556944202; Fri, 26 Oct 2018 05:29:04 -0700 (PDT) X-Google-Smtp-Source: AJdET5cgcWkDWBHzZAtFMC3nuZMRQpS2QEzP9zybxgCnVAhCF5RYikfF6IennGrByZv81hFN8Vkx X-Received: by 2002:a62:d8c6:: with SMTP id e189-v6mr3602503pfg.23.1540556942980; Fri, 26 Oct 2018 05:29:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540556942; cv=none; d=google.com; s=arc-20160816; b=D8K1/Mz6jYBsCG74r7mS6NeI0l9dbWlpbP/ctRs1GNFJImN+8G7fnl4CNYRGeMQ9Tl N9f5Gwh8SYjdQiFmw5Sy3T1w8cqMOa22oswKja6YDUDdC7m/9koGP2dALy7bVvAmtnEP lqsRccZNc2E9yAXBvbdZq+rL2jVxw0ri0PF5R3atWWPk4zz/XznRpAc6bWbVmBhwGMlB QXbdzMXZyRFpVBxtYoASBVzOwjxSe06vL8jh9cFgh9OaiUkhev+wsg6igRspgxPVfETi Ga8+1e/Z4CVVPWEokRSHdgnD9ehpG4YRsxzKZebzlbsaQdsoLqlfQjcpLLyQ1LJWPGOg nErQ== 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=7jK1Pu1OQaxoJuvJBSRzL9Yc+Hbr6sbTeuiVVOQGHpo=; b=TE2Mp3ybs7ygZtkF4NOhLVkMaeQCyUyPniHk4dpzE83A+TcrC5dxzCwJHDqs8f4lFK JWjSoMJYfvqs9gKYO4w86UdU8gVE1K9A3iBPqcmCLbdeKxVT+tTamXw+4pxE4xUPRBhV eU3KDvQSD3eATbxzMk8HihNgiVBbxnW0/nDfDTDDHsVT3U8mGpMsSlCOs7P6tgUjK7nk SXv+36aPdbeJN8uTpwwQsWnhj+PHZVIxcDDF3nhhy7lDDIh4OFotzTmm56hOWlvJ3njI DZYOcCQSZ9R+uPc38/h5YHUCtJNljwbU0Nv4ZfVymY2P+DiV7qNnH2qCAt3kH46H/yyJ ol+Q== 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.115 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id 89-v6si11401786plc.383.2018.10.26.05.29.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Oct 2018 05:29:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.115 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 fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2018 05:29:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,427,1534834800"; d="scan'208";a="91434269" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 26 Oct 2018 05:28:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id D983035A; Fri, 26 Oct 2018 15:28:57 +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: [PATCHv3 2/3] x86/ldt: Unmap PTEs for the slot before freeing LDT pages Date: Fri, 26 Oct 2018 15:28:55 +0300 Message-Id: <20181026122856.66224-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181026122856.66224-1-kirill.shutemov@linux.intel.com> References: <20181026122856.66224-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 | 51 ++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index ab18e0884dc6..e32f3427438a 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) @@ -215,7 +207,7 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) bool is_vmalloc; spinlock_t *ptl; pgd_t *pgd; - int i; + int i, nr_pages; if (!static_cpu_has(X86_FEATURE_PTI)) return 0; @@ -238,7 +230,8 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) 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 +265,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 +305,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 +548,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;