From nobody Tue Jan 13 16:27:24 2026 X-Original-To: dev-commits-src-branches@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 4drF5T0fKHz6NMwg for ; Tue, 13 Jan 2026 16:27:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drF5S3d2kz3KZZ for ; Tue, 13 Jan 2026 16:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321644; 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=yJKdakxRAJuOXtVE7bpdv0zBHAhhGW2XZJI5EhrDf18=; b=K6KVGYZENGIgHno4CRkEdw0X1eHd7kP1vOiAGDRkPIA95z2p70ndu9HyYxNVTmC7ef1byp fg2r00fPIYIz/svOWkHYQ2ooBWoYh6sW0IE/5EBy8oeT2Uy/jBJ7i8PpGDtS/ognRalFbt vd+YZq5X/KhN8cGKlBsEboZCamjXqak+kqde1ansyyiJFQ06/n7KPsdNH13F7YDshfr40Q pdN7p446c2up3ZvACHJ438z+ivVHG8ltrCSVq6jnKY/m4YUFrDp5Y1Tdi6X/VorohmKTQY W6gwt2wy+0eaGEh2HO7Vb4leMW2i6bBZcGfIdHm+bertkc6egSjElXtskz5rrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321644; 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=yJKdakxRAJuOXtVE7bpdv0zBHAhhGW2XZJI5EhrDf18=; b=CHB3I7w/8QQF4T5361foRghMU5kAhn9H6bSXnpLxlB0SKQH9v+7N03qspE2Nn/stn1sJRe MYQYi5r9/ovHm+EHopm90qLWhjEyUp/JgiXCG2DS+msb3gTtIGYfPaCqnRNrTeLl1MpwF3 eukhdA3GQb1f8Zn702RYsQP1SyYBY8dmGIvSTzwSbF5jXonmSEZ5gZ2QldxIoz2pI5rHyY 81MoZXaYtttr4AjAjL7lLdyViV6+t7diKDbdM7R1poQ2G/wofwqsJle3SVaLVmt8UWu6Oe w0ASmnB8P+AYvjACmNDjnFTpYGBtx9Ud00B00VuBPFccD8/y2Rl34DANKt3YEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768321644; a=rsa-sha256; cv=none; b=SOl90AvRxTtExDsugGH/FjG1dqdMqcgadQeKRE2j7ioWv+js/BSlQRP8u8/MFqkChyWwSr OfTxHLIEv6lZ0veat40/VhfCjXr2Wte/rVzmBskiUUr0ueIFuvVEMBD19Vz3a0lEbP6ydL VumB3EYoEn8azUYU3N2+QEYVJgIG4tl8DLgRbjwv+R1oPATNxuwD8uQVnlRhMGa6aROSD7 j3sobDsPltAX6kTmiiQrdZG9OI0NgzsWbR4ggH1JIj3H0tqcBlRhJC0S8ancAtQHM+xmyx vA9POpBs52/HaLe5ywFXgczrD+NsCT7buHo4eOKOM5v4paMZBImu5IIZzdxYVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drF5S2KT0z4lv for ; Tue, 13 Jan 2026 16:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 16:27:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 45ceabd2ab61 - stable/15 - arm64: Mark EFI memory as userspace non-executable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 45ceabd2ab61e0257df90e52c26cdaaa06757736 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 16:27:24 +0000 Message-Id: <6966726c.30d12.1cb8cb3f@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=45ceabd2ab61e0257df90e52c26cdaaa06757736 commit 45ceabd2ab61e0257df90e52c26cdaaa06757736 Author: Andrew Turner AuthorDate: 2025-09-26 15:06:42 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 14:06:19 +0000 arm64: Mark EFI memory as userspace non-executable FEAT_PAN3 adds the SCTLR_EL1.EPAN field. This tells the hardware to raise a permission abort when userspace could execute a page, i.e. the ATTR_S1_UXN field is clear in the page table. This causes issues for the EFI runtime as we only mark non-executable pages with this flag leading to a permission fault when accessing it. Fix this by marking all EFI mappings with ATTR_S1_UXN. The kernel already had this field set so was already safe. Reported by: tuexen Reviewed by: tuexen Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52750 (cherry picked from commit cee4802d0e2a4f55cecb270f3ab00febe4c220db) --- sys/arm64/arm64/efirt_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index 0301eb91c9ef..f814d45f5dd0 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -218,8 +218,9 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) p->md_phys, mode, p->md_pages); } - l3_attr = ATTR_AF | pmap_sh_attr | ATTR_S1_IDX(mode) | - ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_nG | L3_PAGE; + l3_attr = ATTR_S1_UXN | ATTR_AF | pmap_sh_attr | + ATTR_S1_IDX(mode) | ATTR_S1_AP(ATTR_S1_AP_RW) | + ATTR_S1_nG | L3_PAGE; if (mode == VM_MEMATTR_DEVICE || p->md_attr & EFI_MD_ATTR_XP) l3_attr |= ATTR_S1_XN;