From patchwork Wed Aug 2 22:19:39 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: 130200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp781404vqx; Wed, 2 Aug 2023 16:05:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlESx++zZe61Pt6cDar27MUBNSqPv4wAd19lNX1wzDmjBYA2aTuPHSTK4XDggU8hYQjxc98+ X-Received: by 2002:a17:902:ec88:b0:1b1:9272:55e2 with SMTP id x8-20020a170902ec8800b001b1927255e2mr18040789plg.3.1691017548556; Wed, 02 Aug 2023 16:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691017548; cv=none; d=google.com; s=arc-20160816; b=qRnJ6aWWMMchGmfVEr2CsVHpVR9qRJfmJ/LfyeM00e/xRR8TuVWOGl/B/8rBWbbcwN /TREnIQGQXc3fsYxVmK64DL2pb/nL1dngXaInZAkOMiY4iRhC9/DHrQmH/tTjQUM4fsd JvD/gXnnj8YYKIjKiM1nOkhoIUlyXNGSKBcewIrOWh+xpVbd6STHS5BXjhh24Brx1fNF qTDCrJeDAEwHB/J1nXJJQTbezA//ZAN+GnzH2DFzI1AAlUspk9d2VjGTtzHrs6ZNHhoT d5hnXbYwjdfvoeOybZVgISmtF5mCv++MnioI8OkdKhvhWoeSiseWf83mz90tBHtXRbbI mlzg== 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=f5xr0qqhwkFwmGDZ3sWJHT7R0N1dk0BNM0pyytXy6ps=; fh=TjfFO2L539lpgKMtqEaX0PYnq0uSqT9kcPAUdD7BqPc=; b=stl7P/uae8INAAMNMYU2i2hv7oWEBqcpmUdgcfOXTs/07cA+UnlRy/yulrr8uTOTGo GwT0GTWA7ei3OtTWUZ6OhWbjt9WXxBjYfTd2jHZHqTgJ4usvFqSFbRQtctyJtM+K4ptS u3R5obpMskKaRDDTNuE+vB3hW6/65aPzajpeagFLpnPIYWKHVlTTQbAAzTCILFF1Wyaq yk0caWuZCXdr2/LhDB/cXAjLhuuMpjM59wNjH4+gFl9frKeAaoI89T5WHPU0fY07Vdx6 YKD0MLp39xwTL34HvlobcExDZqN8SDCem8NUdzhX8sDOSw91Ortok01b3+ZXKOgd4MIi Yy+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=NQwOo5Yp; dkim=neutral (no key) header.i=@linutronix.de; 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 mh5-20020a17090b4ac500b00263fc986e28si1912441pjb.24.2023.08.02.16.05.35; Wed, 02 Aug 2023 16:05:48 -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=NQwOo5Yp; dkim=neutral (no key) header.i=@linutronix.de; 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 S234133AbjHBWVN (ORCPT + 99 others); Wed, 2 Aug 2023 18:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234015AbjHBWUg (ORCPT ); Wed, 2 Aug 2023 18:20:36 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D3FD30E8; Wed, 2 Aug 2023 15:19:42 -0700 (PDT) Date: Wed, 02 Aug 2023 22:19:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691014780; 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=f5xr0qqhwkFwmGDZ3sWJHT7R0N1dk0BNM0pyytXy6ps=; b=NQwOo5YpqyQBbLcHo9otywP04dPs2NqzrldOeCDI2fndWCkOG/oRUHF7AS9mL4s+IN6WNb nKXZPRZHXj1GKGP8nLeWzKFiT6kmImXFzg8YQ++AAEtBdh6d7X9bWdzoo8c3WL5xupQRb1 dSYmLM5ZNsj+8+U/cpgkhnllX+uHISmLrs5KqBnpN9lO9FQYICzS5hElyy1mdulxooU0NV kHKcikXBTcTP3BfdrJUvUNMlbz3dUCmVP66bYTSfyHBKTTyiOcpUBbGIeCt6R6G/NMacL6 6M2rxqtNMbCdlF+v+kOiL85fMj804N0OWcJwcu1Gs64C7RJvdCNOJMZ0Fyb8IQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691014780; 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=f5xr0qqhwkFwmGDZ3sWJHT7R0N1dk0BNM0pyytXy6ps=; b=oTZuHZfL/Uq/ND3gGcykJATVnEmeG+vkUkNAX6QE9Ip2xsQLdmrO2dz9HqXNQl6ObKfihT yf+UVBih7eQnzfCg== 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: <169101477945.28540.8558037470123487928.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773160417011293640 X-GMAIL-MSGID: 1773160417011293640 The following commit has been merged into the x86/shstk branch of tip: Commit-ID: 6beb99580bc040aed1d5fe7ed9083a4be77f3c20 Gitweb: https://git.kernel.org/tip/6beb99580bc040aed1d5fe7ed9083a4be77f3c20 Author: Rick Edgecombe AuthorDate: Mon, 12 Jun 2023 17:10:48 -07:00 Committer: Dave Hansen CommitterDate: Wed, 02 Aug 2023 15:01:20 -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. [ dhansen: fix rebase goof, readd writable_file_mapping_allowed() hunk ] 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/20230613001108.3040476-23-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 61b5244..e95cfd3 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1631,6 +1631,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 76d222c..44c2658 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1054,7 +1054,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) !writable_file_mapping_allowed(vma, gup_flags)) return -EFAULT; - 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. */