From nobody Thu Aug 6 22:22:53 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 4hGMH16bFJz6nKc0 for ; Thu, 06 Aug 2026 22:22:53 +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 4hGMH15tdqz4Lwy for ; Thu, 06 Aug 2026 22:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786054973; 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=CPi5uNilMc/KfgAQyNWJ43YMFx9e5e2ZB1H9qH+0uOk=; b=DE30ihvW+ExIROr2mugkMiHG277U0EfW0qjOfpTYsBaEOgB3hcbaaieeiTNKJ6eIQy87NW ERRAxTGrxCVMOStOONGzHY31C0Ocq0MRI9qZLPvpt+F+rzpqh3Ix5KeLzW91tST0lM8FLx hQsZnfzgWhH+2OJHUrHwMETH2XFksJbr/X8WyRuj7oQj4tPSItB9NA94yuYoHp9Vmdo2IR oUhPAoBGuGUtw34TkokXpC7qkpSQpAFPZg9G+jZiJz9I7+oXf9SI35S03HHujasym3NaCH g5AZdBXB3b5oMhYvG5m11V0MVGDhPhqywkUQjPhNGiim58ee6O/0pfHjKt7Hnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786054973; a=rsa-sha256; cv=none; b=fvXTDHvFtGYgtXns8YDoAoQHFUPl2LaqN2APzDSe6GSo2OF2Y0MWn18xOy4SabWdtRBv4v 1S6q87f1/4d4r1Z8JApd12pr9/e4q0xPk1kbIXXCrVqcQsnPWmbx3JW8xjdbU3wKEfvldH WUXPQrlZ8Bq9Yuf262lz/4mZoI1w5hpsox6fblPmYq9yLLN3Qrdovu8pcEt3Q+eJb3SZwg YAu3laVI65anBPyiwIe2S3wEVVZ4b7dibWlHk4XJ9Kpsx7h+b+i24cB9cm53cBIbHTRLAe ygUcb+fNlKclEWtRi0hOLNls7BQsSjqWJ3d1QKtQ6eX4PjUqAVl2FrkqsCR7Aw== 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=1786054973; 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=CPi5uNilMc/KfgAQyNWJ43YMFx9e5e2ZB1H9qH+0uOk=; b=LO9OJTMN2AK5Zbbz3qWB0YsDXB3KyrOtlf2Gw/aiJ/xpIrT0MHFI0uElG8E0382WCokv2P 6kamx6XfZst+3/1Nw/IX0WZFcrh2cMpvZLQySa8ZE+tPXnHCGDVEATqF96S5zhP9tR/JDM 9Avb4H5OlHqTXiij0vpyV1cS1lBpcjrs+6cDTqh8wdvl6vrKTGlI9AXz4oMgKvN4VqY0u7 LJMHkQU8nlH0TV8Ooobc7Qx3kBZx0X0oNZCZq96AoPSo3PMoDaZ70b2dxzOx25YI1ssMgp lvUGTizQnrKWgrIrOnfLTezhc2m1O1XeM6R4JtM8zh5uU5HhY7RWzwpxGhVjhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGMH14symzfgD for ; Thu, 06 Aug 2026 22:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e772 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 22:22:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6db7fa3765ae - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6db7fa3765aea89329830c892547695e477d3bfc Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 22:22:53 +0000 Message-Id: <6a75093d.1e772.57742b7c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6db7fa3765aea89329830c892547695e477d3bfc commit 6db7fa3765aea89329830c892547695e477d3bfc Author: Ed Maste AuthorDate: 2026-07-21 19:19:40 +0000 Commit: Ed Maste CommitDate: 2026-08-06 22:19:06 +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 (cherry picked from commit 2b1df6149e8a2d50a09d13c64d1574dad91e10b1) --- 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 fa7bc82c2fb2..592d553094ab 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");