Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6266354rwb; Tue, 9 Aug 2022 12:04:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR46DKJNR7AC+mwylSXByNBpAlm8bnexhLSo6Uy2pcyGV8wOtSoijWoUVn0ZKxRDpSp1DdBd X-Received: by 2002:a63:353:0:b0:41d:eeb:aa5c with SMTP id 80-20020a630353000000b0041d0eebaa5cmr16789817pgd.90.1660071846573; Tue, 09 Aug 2022 12:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660071846; cv=none; d=google.com; s=arc-20160816; b=TMYQysNkVbKmlVxZ4yh60ubFSJwBDwhZgqUKUFH44YeAXgYASdkOcAbteWbSprrFem w9GQhXjBYoYsWfDUtJ5QZk+A42ruTRqL0PuCrSLE4Kkq6Y4zCoEBtXboaPdsxO1AK/U2 T9Fj7tP6WoEbw0Y0Eu9YcC7Tqmo58X4OBro3r1zZZ+53Gn6dodU0iXktaOCLfmg6RNIy LbLFkx6MdpXPGb2C686w3RMDf0VUFpk2Tm8bxPwrBMH06E7X7Kfr+zxLOUyKcyGMkpFo RvaPdu8KwKxZhl7uSZJxuHbzjuqbFqvSqg0HO+PGGsZVAl4bqWzBx7UAn6dobQ01g63F +Afg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fdERn/Gg8xfbnG3C12MjHGuccDOCoprDTgm4SV5klG4=; b=lkKoT+VmGhiAqkZypwXD20VoRkCoN+aHnoubxaTzCngnDOt6yFzEkV0392JHAzk62E WElD1Wk6RdW1gJ5VSlkdCYhD1g6Nfk9s0FAp4GpRaYmOcWmmDtwDSBLopAKITCohgGqn qbDB2bxhq+YqTvNoKElf725V89jGxIqU7FfdfBdNN5HacIzEs/yYJdWMQu8UeLGlrblN rzf9vnCTYwqaaW49wWOnsAJVquHqYfR0q1z5RWk15QpJLSX+K/p6IaMDxLHT/oCX/H3U ciNiFZyPsJiHSXvDzgpGolLx+i6aq/62E/Brp1/BSLVku5wCJbWK4zquT+CNsgHLAgcu aNyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zur7zKxt; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f3-20020a170902ce8300b0016c41400ed6si16887717plg.41.2022.08.09.12.03.38; Tue, 09 Aug 2022 12:04:06 -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=@linuxfoundation.org header.s=korg header.b=zur7zKxt; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343988AbiHISYR (ORCPT + 99 others); Tue, 9 Aug 2022 14:24:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347248AbiHISWG (ORCPT ); Tue, 9 Aug 2022 14:22:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49BE13190F; Tue, 9 Aug 2022 11:08:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 16BFCB8198C; Tue, 9 Aug 2022 18:07:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34567C43470; Tue, 9 Aug 2022 18:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660068437; bh=Du+LfgidnyUZQYmLnNKvCIdplUELRrxtwIDyhwydf1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zur7zKxtD12ZouyIjmHgS6iqi7LqByyMG7O9tQ1HSLE8j+t7KnrLPM4MgodQjLWdK +fJPbP7MFjCzl2U0U0sEalqEib7W/hwFeq58F/aIKHcMTxCm7NXpC7vNya1+71x8HN 2WrdlYway/M+/TFnMdfs7HpCANYyCJI3kwHP5GiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Collingbourne , Will Deacon , Ard Biesheuvel , Catalin Marinas Subject: [PATCH 5.18 19/35] arm64: set UXN on swapper page tables Date: Tue, 9 Aug 2022 20:00:48 +0200 Message-Id: <20220809175515.739951080@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809175515.046484486@linuxfoundation.org> References: <20220809175515.046484486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Peter Collingbourne [ This issue was fixed upstream by accident in c3cee924bd85 ("arm64: head: cover entire kernel image in initial ID map") as part of a large refactoring of the arm64 boot flow. This simple fix is therefore preferred for -stable backporting ] On a system that implements FEAT_EPAN, read/write access to the idmap is denied because UXN is not set on the swapper PTEs. As a result, idmap_kpti_install_ng_mappings panics the kernel when accessing __idmap_kpti_flag. Fix it by setting UXN on these PTEs. Fixes: 18107f8a2df6 ("arm64: Support execute-only permissions with Enhanced PAN") Cc: # 5.15 Link: https://linux-review.googlesource.com/id/Ic452fa4b4f74753e54f71e61027e7222a0fae1b1 Signed-off-by: Peter Collingbourne Acked-by: Will Deacon Cc: Ard Biesheuvel Cc: Catalin Marinas Link: https://lore.kernel.org/r/20220719234909.1398992-1-pcc@google.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/kernel-pgtable.h | 4 ++-- arch/arm64/kernel/head.S | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -103,8 +103,8 @@ /* * Initial memory map attributes. */ -#define SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) -#define SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) +#define SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED | PTE_UXN) +#define SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S | PMD_SECT_UXN) #if ARM64_KERNEL_USES_PMD_MAPS #define SWAPPER_MM_MMUFLAGS (PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS) --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -285,7 +285,7 @@ SYM_FUNC_START_LOCAL(__create_page_table subs x1, x1, #64 b.ne 1b - mov x7, SWAPPER_MM_MMUFLAGS + mov_q x7, SWAPPER_MM_MMUFLAGS /* * Create the identity mapping.