From patchwork Sat Feb 18 21:14:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 59008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp555543wrn; Sat, 18 Feb 2023 13:21:37 -0800 (PST) X-Google-Smtp-Source: AK7set/scILWt9XAlr05AAhH1KFyocQ/WF9s0z+E601O2J2Z2AMYtVR0mnubu5jHo+MjwAU92XM9 X-Received: by 2002:a05:6a20:bf02:b0:bc:d6e0:3ff6 with SMTP id gc2-20020a056a20bf0200b000bcd6e03ff6mr4984503pzb.52.1676755296734; Sat, 18 Feb 2023 13:21:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676755296; cv=none; d=google.com; s=arc-20160816; b=Sxf8fw1gEw4W/KCJralSR4dZlQSsQGXlS6mTeVEycWYhyJJBngvtr76zaaZUz031l/ oGtZjln49SBXWUnt0CQAugjnDmuCA2RrPe+CwRX0zftpI5W2dW+uN+MjrltcOS0fpu5C 77pJm197peyg3fgI5xqs5QtjQpwZolFtqTYMuPJ7d0etRToUZPKbnirReVejGORtZ2lu lpnIDeXor9e1V7IYnOEiRuj1sZofeG+5qpQnRrq5fXPG7FBPsrac+ww5BMTIO0XUuPqI hJdiS96DnDLysZWza+Q/xt5fDT3546eN6e0iukSZVdFvxaFoJnltLfZvL2ztO5GzC2TG EjIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=W34Awsk7ObJ3JdP2fcXDLIDAtaSphGEmGZ3iOjCGOHY=; b=Os3Fsm3XjHf8dDL4f3gqjZKxHYjKdChSrHRUjODvK0oeI34/6YO20XkOZWba1LSYzq bS9RtjM3sNki1AIGlcWYzCDLDM8+2RNWvlgVXHVZd02KD04iepXl/r238t3hQeob/uY6 X9Z3GMD4iG4kKT9V3NYqtNYMfl9Dnx9zSPIiQZacnPFEyQU+dxg16slA8rvpCyh8nnWR zYGXL4LIwMtabIhiwWWQ6RtHAiDfhq1nhJPyhYoqpcPtNkSnmXt78iGkKWTTXbrj3X6O ZlBIqRN6BoN6No3eODOoyE/mHmyDIHAGZrLSn9gRF7uXTcR/ojWTpbMD4BE1X6+YPZG8 UjRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kqEWwUqy; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h70-20020a638349000000b004ff6eee716csi4632003pge.398.2023.02.18.13.21.24; Sat, 18 Feb 2023 13:21:36 -0800 (PST) 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=@intel.com header.s=Intel header.b=kqEWwUqy; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbjBRVVH (ORCPT + 99 others); Sat, 18 Feb 2023 16:21:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229820AbjBRVUA (ORCPT ); Sat, 18 Feb 2023 16:20:00 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 138CE1114C; Sat, 18 Feb 2023 13:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676755080; x=1708291080; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ECFpkrFmLdwFWEoO9V0RJS5m7s8m94UVjRDo+XGZ7qk=; b=kqEWwUqyuGu3GEPWQidmQyEuBTuT4U4rYpfDZD9fLYOO/ZygnxZEKq1A HSJVB300oDnOMk1Yequ4XHcy+/XzhvMZU4/3fWrWJ9vhzH3h3Q1PzSR+r 8TdTZ+09lqPNSUFs5Zwg3r8eeFx5Ln3kXcyiVTZpjVnkCNiNld0GB3Q4W E0QwOaGp0/EeyAjDqoDzfzbjHIX4iOemCAc2b5qLkGPYh8ghmomnuYzmf /o9PFMOANghyDA3puajNqFtrrjmR/q7DgbPZIweasIw54POY4zgRblEFj /uSu3B1wjByDH3qeIHn3jb6kw6h36pj3y9tlKlOfhfECK9jJA0Dc/LKXk g==; X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="418427614" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="418427614" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:16 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="664241685" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="664241685" Received: from adityava-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.80.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:15 -0800 From: Rick Edgecombe To: x86@kernel.org, "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Borislav Petkov , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H . J . Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com Cc: rick.p.edgecombe@intel.com Subject: [PATCH v6 24/41] mm: Don't allow write GUPs to shadow stack memory Date: Sat, 18 Feb 2023 13:14:16 -0800 Message-Id: <20230218211433.26859-25-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218211433.26859-1-rick.p.edgecombe@intel.com> References: <20230218211433.26859-1-rick.p.edgecombe@intel.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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?1758205361703699824?= X-GMAIL-MSGID: =?utf-8?q?1758205361703699824?= 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. Shadow stack memory is writable only in very specific, controlled ways. However, since it is writable, the kernel treats it as such. As a result there remain many ways for userspace to trigger the kernel to write to shadow stack's via get_user_pages(, FOLL_WRITE) operations. To make this a little less exposed, block writable GUPs for shadow stack VMAs. Still allow FOLL_FORCE to write through shadow stack protections, as it does for read-only protections. Reviewed-by: Kees Cook Tested-by: Pengfei Xu Tested-by: John Allen Signed-off-by: Rick Edgecombe Acked-by: David Hildenbrand --- v3: - Add comment in __pte_access_permitted() (Dave) - Remove unneeded shadow stack specific check in __pte_access_permitted() (Jann) --- 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 6b7106457bfb..20d0df494269 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1641,6 +1641,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 f45a3a5be53a..bfd33d9edb89 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -982,7 +982,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. */