From nobody Tue Jul 21 21:23:41 2026 X-Original-To: dev-commits-src-all@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 4h4Vk62V4kz6mTBk for ; Tue, 21 Jul 2026 21:23:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4Vk61Vffz3Z59 for ; Tue, 21 Jul 2026 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784669022; 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=RKrN7YNmo4hnk86SihhW/SiznUnc+qXHavOFQMtdQoM=; b=XXzHpAj+smY56Xrw4w/DPkgU9/21jVmKppYl1B5ncA3L+BzCLF+fk15r+NVMlo4syw4wjM PRQOuttEe2SROVEZAmX37A4r5z3bxwRTYtPGQPmM6DW9s0EgNsLWJ+aPcSxjcL8/tocutz YbTVvk1Mzwr2FfKuWYnUO4n8w5ku9D0XIna5af/hJi6YZ8nMa0A6y6yMCIw0za0ahhO83N ykbqFyDyQuiOIVnHXBADJQHl+AxD5FOoOgkUcvCMqqxQ7AU8M1U3+uv2aUKdj1w+Z2B8L7 ZQUKj5zu+31BUQzvuGtcNhhpETmmoI+evESyBPW9hRDOKvOmu4LqTheAGTMRSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784669022; a=rsa-sha256; cv=none; b=NvX1B0K0KsNoprDwHL5fyRgdE0VoHoZc3ql3HR9wuzsFwCUB1VDiJRU2a3lHId1HQ1Ndvl VgGF+az82DdGs6NHXaJdjwWzlet0bZrr6VPC7lhYrFPBM9GIjNugyAqDd8E+z1MH8+JMV6 ulC8+AqIpbs3bqHCewS7nEMkBgscM8Cb/Uafxk2YQEs7bCvrLNaZMOCWTfYZRDkAVnG4AB zmkZ1g9WLhTupakcePIRbabbxlVyojxIN84IgV0SWhsv0ARCrcdFigz6h34j+WHKz5EYxm xevpWPa/MBNZoK1LB+nVF8aX0wzHE10Fv943qEjGaGNKRQSFV3W23eo5889GUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784669022; 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=RKrN7YNmo4hnk86SihhW/SiznUnc+qXHavOFQMtdQoM=; b=ZIdR6g1kJCTwugMnptAHEsWywj+D9TC6lhuGdy8fb7Ui/SJO7dRHy+TKk1r693p5Z9+s0c rwMHBND+yFGYI27qwpJysnJ5miYichMBofA5HAMqpiCK/CNCOlEHZhaOuzbB91ZUWlQ30J 98Gi5N9/H4BobjO9bdboT9Io2WBWjdmynOxBWcSRsuJQ2oDiWZzbUcgVCy6qIrwLTqYjir vvALwZ5ikAmf6Lqg1Pi8xlto9NZuYBNMTJ31GfWJuxFoMlafjHEJgyTbVn892DFTLAnOye I2btNJ0DFEk7TvT3JW64MH8COohegq3B2KbAgUarx5D4WyjPmxy/RtktDEttHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4Vk60086z15Hb for ; Tue, 21 Jul 2026 21:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31069 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 21:23:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2b1df6149e8a - main - loader: Allocate trampoline as EfiLoaderCode, not Data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b1df6149e8a2d50a09d13c64d1574dad91e10b1 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 21:23:41 +0000 Message-Id: <6a5fe35d.31069.4a3325c1@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b1df6149e8a2d50a09d13c64d1574dad91e10b1 commit 2b1df6149e8a2d50a09d13c64d1574dad91e10b1 Author: Ed Maste AuthorDate: 2026-07-21 19:19:40 +0000 Commit: Ed Maste CommitDate: 2026-07-21 21:23:11 +0000 loader: Allocate trampoline as EfiLoaderCode, not Data Firmware on a test machine applied NX to non-code allocations, which resulted in a fault when jumping to the trampoline. Reviewed by: kib Tested by: Jim Huang Chen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58383 --- stand/efi/loader/arch/amd64/elf64_freebsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c index 62716d7b1369..2ba5c1419168 100644 --- a/stand/efi/loader/arch/amd64/elf64_freebsd.c +++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c @@ -102,7 +102,7 @@ elf64_exec(struct preloaded_file *fp) trampcode = copy_staging == COPY_STAGING_ENABLE ? (vm_offset_t)G(1) : (vm_offset_t)G(4); - err = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData, 1, + err = BS->AllocatePages(AllocateMaxAddress, EfiLoaderCode, 1, (EFI_PHYSICAL_ADDRESS *)&trampcode); if (EFI_ERROR(err)) { printf("Unable to allocate trampoline\n");