From nobody Fri Sep 26 15:09:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cYDWb27glz68Rnm; Fri, 26 Sep 2025 15:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYDWb1XQRz3kTF; Fri, 26 Sep 2025 15:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758899355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqHOrS82ZGijAAwrPwXTkQNDkzKxJ5QznllBCSbeink=; b=Q6BQe9KnGMrT0AxEE9KDoQ787E9z3pQs3h89f6Nh/E36/shaYA0x5fZL9CklH93iqMEgrE 59NnsMuq4RA1qBiyGKIZ8qPmoBZzSdiAekCOjYkfJKuJAtsqRMOJHu//YgReafyV4M449N 9m/30L8QaR4Jc7XwigejMEQrosQKWXmggWgHm2kSbE+vcbPO7enOVHakRovWDsv5P2UZwd RaMQ5DRjD+THqG5O/fD7rtzmXOfiHfAV4tY4Kb4vdwUEf6eZ7E7AHXgcXDVT3YOA+I3IPz 0SKICrLorcxbDLKa1wrnT5rVCM2YmWfWleHSqOrnZG9myssjZiRdbqma4SGdXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758899355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iqHOrS82ZGijAAwrPwXTkQNDkzKxJ5QznllBCSbeink=; b=lYCBhMW9LEhKU4MujARu1kPVqL2QyhuL3Ry0SW5HPKnwaE8I7ILvxIA8CaRPqCqiy28vmU R3Jn83Ev17KDrJ4yMEv+k/0+vZP8hX1E9lpVWsvr8RvAbU08ESQCeqswT0u95dhnlSdYyi NOdLqd4y9lmwThBg5xaEt5nV0Q+DVN/TRYd3s+g8LCgfyezolpKOv5nrtT8YiGnbcGfz7i ICCjZDJgxwJfywM2O4pGtCEBCufxvhrt/BCUcgtVGDaXOoEdfsQliY1VtiiuKJ+MOECvnN vDizpTZ5yfp8D8qoAoGccgkJIK72bUItjBw4yFlX8CHvlpu/AEuEp0NmQwQ5fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758899355; a=rsa-sha256; cv=none; b=XlzHa/RmruAtPLed0oZrlkVtCYG28b9bl6yKsdOTqBTOixjwyQZ2z40pge1uX+lC8msZa2 nH7MfpwnNk3klqabBInLqEtcBTkPQyKmdbjudrjkSZlYFlOKNgEa1OFLfG9RDy6GQMXk+p RNu7UuOkSW3T4lI6lc29XTwtZukNOvJO51AIN/vFhQzeL7J25Vw6QfDjAePJuk/gzQz336 V9gokdwplSWTgQbInqYH49yDSDY3hXjMsabt9wtrXw1Ao3U9Pv5N7A6YCfKFbpNsE+THih ttKAbrMBPjW8HJwpMW2EisnkubfQ0Ycu1tu9YDUz4seQ53/qHuyeaP22P+HLXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cYDWb0ztKzsRC; Fri, 26 Sep 2025 15:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58QF9FK8058159; Fri, 26 Sep 2025 15:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58QF9FaV058156; Fri, 26 Sep 2025 15:09:15 GMT (envelope-from git) Date: Fri, 26 Sep 2025 15:09:15 GMT Message-Id: <202509261509.58QF9FaV058156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2554148bd85b - main - arm64: Add table attributes to the EFI maps List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2554148bd85b172afcc1431df3272f920c82ebce Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2554148bd85b172afcc1431df3272f920c82ebce commit 2554148bd85b172afcc1431df3272f920c82ebce Author: Andrew Turner AuthorDate: 2025-09-26 15:06:58 +0000 Commit: Andrew Turner CommitDate: 2025-09-26 15:07:41 +0000 arm64: Add table attributes to the EFI maps Use table attributes to also limit unprivileged access to the EFI runtime mappings. This is mostly for parity with pmap as this is never mapped while userspace could execute. Reviewed by: tuexen Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52751 --- sys/arm64/arm64/efirt_machdep.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index f814d45f5dd0..bde0d4f784dc 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -106,7 +106,8 @@ efi_1t1_l3(vm_offset_t va) if (*l0 == 0) { m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); - *l0 = PHYS_TO_PTE(mphys) | L0_TABLE; + *l0 = PHYS_TO_PTE(mphys) | TATTR_UXN_TABLE | + TATTR_AP_TABLE_NO_EL0 | L0_TABLE; } else { mphys = PTE_TO_PHYS(*l0); } @@ -117,7 +118,8 @@ efi_1t1_l3(vm_offset_t va) if (*l1 == 0) { m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); - *l1 = PHYS_TO_PTE(mphys) | L1_TABLE; + *l1 = PHYS_TO_PTE(mphys) | TATTR_UXN_TABLE | + TATTR_AP_TABLE_NO_EL0 | L1_TABLE; } else { mphys = PTE_TO_PHYS(*l1); } @@ -128,7 +130,8 @@ efi_1t1_l3(vm_offset_t va) if (*l2 == 0) { m = efi_1t1_page(); mphys = VM_PAGE_TO_PHYS(m); - *l2 = PHYS_TO_PTE(mphys) | L2_TABLE; + *l2 = PHYS_TO_PTE(mphys) | TATTR_UXN_TABLE | + TATTR_AP_TABLE_NO_EL0 | L2_TABLE; } else { mphys = PTE_TO_PHYS(*l2); }