From patchwork Mon Mar 20 16:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 72309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1331422wrt; Mon, 20 Mar 2023 10:12:08 -0700 (PDT) X-Google-Smtp-Source: AK7set8kV47lPxYNo/oBEKwkHqh+5xYthXcymjqoR6J3kavgzkMTAf+KHigisjtBKVyyXiC7Xn2C X-Received: by 2002:a05:6a20:3d24:b0:d9:1fa9:c59a with SMTP id y36-20020a056a203d2400b000d91fa9c59amr4696150pzi.8.1679332328579; Mon, 20 Mar 2023 10:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679332328; cv=none; d=google.com; s=arc-20160816; b=UHbh6I2VWNRRltp5RAmnTlmoannrpUCZhvbOHO6JQ0sLFZBJBNtDFoOl3uGyCWA7jw lYso14Jw1ID+RVqMTtjFqZQmY54YsnkUMyeUty8IJLDHids/X03ymEHUDj7iM5jw/X6Z ji4Ggz0q37Q2bUWXBvlk+PsfBGt/adaK1BpImabuqmxEtuELlzT1UR3+VdjEfAkSpbJ3 54yBxAfXkOvXP9XbT72T8apzP7NZjEfnaKGKDgV7MQjgQDeubXcPaqTGKtLEaOoMyKxW lozxf199afd89oWVXl6a8WkKfQLmTBSTCb4JX2ISQH1AMLTC7bJrWqqvPMH3NCG2mtj/ /5lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=UGS0er2Lg/HFrgzNy0+KpO36GJYrn4O60MmTJDzTSbU=; b=F0OlI9QDCVB6+nFUD4Olq5N8zpeV54njmoyRrfIpGCLkqXz8x2ji36D/Gq/Kxp7CKH /7yptTccOVyl3hXcuTd5Vhu+e4A1Cw2d5tWsSdFE1EkAY8fJoDXGJ+5k056UQKkjOuPh L34C9i3YuzUAD41Kb8CfCSAzEQzdL3IhKjsCUNzXn9f8BNJgPr8O1L/dsl0uSMcBgojG 2rnOLlwR4K+rrEavrRA1O/1cJfqQhVcbL/AyMnsJO63r87oX+2L/OnwXqxL30cLqitm8 7t7Le0yiPiSDb9F9ewx/mGMn07RK/dOTd/jY4gGd4YpN05Lf6YnF7DFnf1bgNnHnoldj uxTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3lSYdwOD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=R8J+Ljfq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z38-20020a631926000000b0050324795c2dsi10712230pgl.400.2023.03.20.10.11.53; Mon, 20 Mar 2023 10:12:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=3lSYdwOD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=R8J+Ljfq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232556AbjCTQtJ (ORCPT + 99 others); Mon, 20 Mar 2023 12:49:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232528AbjCTQrm (ORCPT ); Mon, 20 Mar 2023 12:47:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60E9DB766; Mon, 20 Mar 2023 09:41:13 -0700 (PDT) Date: Mon, 20 Mar 2023 16:39:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679330365; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGS0er2Lg/HFrgzNy0+KpO36GJYrn4O60MmTJDzTSbU=; b=3lSYdwOD9gsPSn9Km2sBLy196tHSOp8DfMCbxRqQ/3puZwoYPnvINgzeiudUIY26VHDsM7 q8cJNRaZkbh/B+4/LRTr06ibkW5y4nzCNCKbBnXhDJVK+5hUSHPCIncPTaZ/3r9oXp4kAI ogrVProc2JV1cWL63SFswplN8YadCios0svsoSZMC1SW1moihc3tI4HSU1iuhw2CWNb9BV OVmfiaUhlbRjKKMpUZ8WVvzDreFOJLOfw4QxLNbn9z7iQW4InpcYZU7uw81/xeKRB9hssq 7rP4ccALImzkJ2PMVib2Mz4Y6iL64gvjYJ2VNJupjOfcx3lhCNIid5rsdzJAwA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679330365; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGS0er2Lg/HFrgzNy0+KpO36GJYrn4O60MmTJDzTSbU=; b=R8J+Ljfqrv9YhI7Dc6tEXTIJuz3YvzMCPyMF7zhmvXYFb9dbW0X2KlCcCNARVD3FcVho52 tZZ948lnqBt+qLAA== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] mm: Don't allow write GUPs to shadow stack memory Cc: Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , David Hildenbrand , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167933036476.5837.3311348958638945300.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760907576085440188?= X-GMAIL-MSGID: =?utf-8?q?1760907576085440188?= The following commit has been merged into the x86/shstk branch of tip: Commit-ID: 75818f575af6d20c96ac42fd8fc59020ed24f331 Gitweb: https://git.kernel.org/tip/75818f575af6d20c96ac42fd8fc59020ed24f331 Author: Rick Edgecombe AuthorDate: Sat, 18 Mar 2023 17:15:19 -07:00 Committer: Dave Hansen CommitterDate: Mon, 20 Mar 2023 09:01:10 -07:00 mm: Don't allow write GUPs to shadow stack memory The x86 Control-flow Enforcement Technology (CET) feature includes a new type of memory called shadow stack. This shadow stack memory has some unusual properties, which requires some core mm changes to function properly. In userspace, shadow stack memory is writable only in very specific, controlled ways. However, since userspace can, even in the limited ways, modify shadow stack contents, the kernel treats it as writable memory. As a result, without additional work there would remain many ways for userspace to trigger the kernel to write arbitrary data to shadow stacks via get_user_pages(, FOLL_WRITE) based operations. To help userspace protect their shadow stacks, make this a little less exposed by blocking writable get_user_pages() operations for shadow stack VMAs. Still allow FOLL_FORCE to write through shadow stack protections, as it does for read-only protections. This is required for debugging use cases. Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Acked-by: David Hildenbrand Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230319001535.23210-25-rick.p.edgecombe%40intel.com --- arch/x86/include/asm/pgtable.h | 5 +++++ mm/gup.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index d81e7ec..2e3d8cc 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1638,6 +1638,11 @@ static inline bool __pte_access_permitted(unsigned long pteval, bool write) { unsigned long need_pte_bits = _PAGE_PRESENT|_PAGE_USER; + /* + * Write=0,Dirty=1 PTEs are shadow stack, which the kernel + * shouldn't generally allow access to, but since they + * are already Write=0, the below logic covers both cases. + */ if (write) need_pte_bits |= _PAGE_RW; diff --git a/mm/gup.c b/mm/gup.c index eab18ba..e7c7bcc 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -978,7 +978,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) return -EFAULT; if (write) { - if (!(vm_flags & VM_WRITE)) { + if (!(vm_flags & VM_WRITE) || (vm_flags & VM_SHADOW_STACK)) { if (!(gup_flags & FOLL_FORCE)) return -EFAULT; /* hugetlb does not support FOLL_FORCE|FOLL_WRITE. */