From nobody Thu Aug 6 15:01:27 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 4hG9Tg5HvQz6nB8B for ; Thu, 06 Aug 2026 15:01:27 +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 4hG9Tg2BCqz3DqJ for ; Thu, 06 Aug 2026 15:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028487; 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=YXRD36xQ9BXYzMu3zCz/wVzy9QAO5XHtePwayz5zEec=; b=vH0Na6ocQLRGLsjRHF5UVrSLc1RBL24dNI7pfTm1z4xJ0XY7kCodUTNxsCG2iLygOWn+pr RHgkx8HUd421vXS5ws5SdvrtG3sIcGdA7d/EjKoTPqjXXv7qNZ6i7h7RvVYZhtpGMIv0ZW lyelH1wlyfr4EZSNLp067i3AZKNkHt4fAMiEIljjC+tYLkfjWTAOWTAnVD4Ye7NVDQSzmt 8uve+JBoZ8FzL6uQPc9c/qBhuOSTt9p0WZOrzRHkZYMMEC+JrW1AeY42aTvz8F/MSUKppW 3oR5YoXQoc5RpXlFd8Pjro+5ZFLYl3N5oonhsbUneiOe/0tcPpJxUI3HrXJFxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028487; a=rsa-sha256; cv=none; b=S7+CkisIMQ34ovm5j/AO2XOWbG8Anui1vrleuWf+6RLO3V77tem8f7lCVNwegc+B8El+cq bpCZoenOOyyD+YRqBDak2HN3Rc4CnFGUTCMDt4jh77OCXgqcgxYmd4XRNtchQLnaL8ATIm C+QudC9Ir0UgRRr0YxTaawMiuJw6ZBzNcNoH0PktvIg+u7gIteFitvoTjrxM2hIs1Tnfpi sbKJY9MyQVGdtfEpnLkOj2MFQ8894n65dNw9J7brINtU7Cs+Zo1DMxlCGWnKx0sO1ST/Qz owSabopZiBSFdmqsCZC5WPojlpU+am/JP/36xS4zxahoSAhBwVpzbvvXKCk3cg== 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=1786028487; 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=YXRD36xQ9BXYzMu3zCz/wVzy9QAO5XHtePwayz5zEec=; b=KSmW5G/RhuqmcfSn3aF+9jrqNr8AfKnZ1b8RzCZcInWj/+nDJDFodnGAiJsjOg0UGMzCu7 w0G9SEYMzvxnYHiFTM4eHI5+sms22oF02y0aXkPNrGUDLKEThVco1GWgCaKlAvXo+6nFE/ Xt/QzU0XnOpQA/81H1KO8JEquDrDCA/TwKJCVaNZYEfFD3Y8irHAgh8y0mHHfgAwSgDqYN okrwSkbkrU98Eg8TpDvvn7l1b9x3JJFxA0tEwmafCmqrnOeeglA0MFXJvPb4dcZs5/EudB 5rKcHwuUP2e7Ax8ZsRUS3o8nO+10toix8pXRsgt+zEQIrH871re5dhau+c36EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Tg0czHz9NF for ; Thu, 06 Aug 2026 15:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46c8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7eb4c67be503 - stable/15 - loader: Fix error handling after an allocation failure 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 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7eb4c67be503176d4824d8eaccd70ae942569e54 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:27 +0000 Message-Id: <6a74a1c7.46c8c.1154b92a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb4c67be503176d4824d8eaccd70ae942569e54 commit 7eb4c67be503176d4824d8eaccd70ae942569e54 Author: Mark Johnston AuthorDate: 2026-07-22 00:17:56 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 12:52:27 +0000 loader: Fix error handling after an allocation failure MFC after: 1 week (cherry picked from commit 5001af647b3b263aeb3d4fa7a6c2690399265202) --- 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..fa7bc82c2fb2 100644 --- a/stand/efi/loader/arch/amd64/elf64_freebsd.c +++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c @@ -163,7 +163,7 @@ elf64_exec(struct preloaded_file *fp) (EFI_PHYSICAL_ADDRESS *)&PT4); if (EFI_ERROR(err)) { printf("Unable to allocate trampoline page table\n"); - BS->FreePages(trampcode, 9); + BS->FreePages(trampcode, 1); if (copy_auto) copy_staging = COPY_STAGING_AUTO; return (ENOMEM);