From patchwork Thu Jan 19 21:23:01 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: 46001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp557275wrn; Thu, 19 Jan 2023 13:39:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXua5vr5a1foTjkwezxM4Z1/KJL5vekTrGeJf58KkR4qUbd0xmz5jyGsY0ZIc/e7eVm7X3B2 X-Received: by 2002:a05:6402:1748:b0:497:c96b:4ded with SMTP id v8-20020a056402174800b00497c96b4dedmr11879881edx.34.1674164367852; Thu, 19 Jan 2023 13:39:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674164367; cv=none; d=google.com; s=arc-20160816; b=loBVLZDkI0OcUghQrcPKHjzfC1T0fCoziwCV7u8MN/nKmRwP6i709hnkOqMXaa8b2D gN9xFgJRv+xHfpr6Rnqqkd2vcXKfgonTK8n3L3H840VpcR5s6MEYwTCT1DMFCfd6icrF afOnwmf0CmeeU1jOA5MhQ3osFcHXmnxEEY1Qt3zT2nfW/mw+6slbHidEam7L917TJf6/ NZWZSk3pfO9KvaexltYTCUzSuT4KvMcu8YfuhCWeqUGqYKE+SBNWaHoc0e4cDwJTcZa1 9bqIzIt8sFAJi6/OTBUE3QsFVx0yv2kyNQTxebBSbNpdVMQsySe3C6VPj8YpGZ4B5Fke CEGQ== 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=o/4m81j8xE9qAXKmMhKAmN4IZZXNyomiS4bHPHlONRs=; b=F+6MG1vKE5OdRScZCIi0I2dUDqmG7CpjFuizvCEfBVnJdT35t70YvTWxvakHRcXPH7 qpQb5Ubampp8Osr+COVNd9dmU1oVAk7tnt22zA+pAP6d6axjFet8UWMJub/EYMeFkm3J AjX6dcNBQ+gb3BGjOV4vf43MzEh5+dx6fy6BeLE/+2rHodUx8T42ybo9t7BpQkAgXjY+ aBw9GbjFNJv9hNLZ91V3+MxWYei4fJ+MvFFYOn9Zrgy4aeBj+wMt8nyeBKrHIoYnDqmo hTGEH08F7O9rmdTPQ3kOjdv9QO2uo+hXBEhgl0GDLhcqMfsNXgWpu5nN0WbfKmWwuvwu AbqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YqFLZxTy; 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 z5-20020a056402274500b0049e04fbb455si5026437edd.40.2023.01.19.13.39.02; Thu, 19 Jan 2023 13:39:27 -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=YqFLZxTy; 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 S230333AbjASVih (ORCPT + 99 others); Thu, 19 Jan 2023 16:38:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230360AbjASVgk (ORCPT ); Thu, 19 Jan 2023 16:36:40 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4470470BB; Thu, 19 Jan 2023 13:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674163657; x=1705699657; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=yljn5XVXAdgu3Q2GcXJK+3SbP1Csl5qMglVIozskdYk=; b=YqFLZxTyIsujYz3gN3vQEMR70Y4gSG5cGHBogLBhl17d1BnQkjBddnZ8 h5GrJV4tRpPIZwcXuv/+ZMCNcK9hAv3npLz8E7v6jI2pTv6j0AweU47BN weTM09pUXNaDWzi+sVZkQeMa4Nix2JwqLHgjg4qD+YnHe9rJhgYJe/rJr bKohICN8hImR7tZr994a/6wa9+2nCOlcJXBgpSS7yTgQdowD/2otxTpXz C09Hu2Ulro3gG5d5XKQBMWXlER2N/VJ2ChL9vXzA8tkMEJA0rrAirQuxX NRVWr+ewtf5hmdJstlI/CENHvZZXGpEvlvj6HEBX9LtZ+8hRpntbpyYaa A==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="323119716" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="323119716" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 13:24:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="989139111" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="989139111" Received: from hossain3-mobl.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.252.128.187]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 13:24:00 -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 Cc: rick.p.edgecombe@intel.com Subject: [PATCH v5 23/39] mm: Don't allow write GUPs to shadow stack memory Date: Thu, 19 Jan 2023 13:23:01 -0800 Message-Id: <20230119212317.8324-24-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230119212317.8324-1-rick.p.edgecombe@intel.com> References: <20230119212317.8324-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?1755488576161892747?= X-GMAIL-MSGID: =?utf-8?q?1755488576161892747?= 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 --- 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 87d3068734ec..425ded5dd6ec 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1671,6 +1671,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. */