From nobody Wed Jul 22 00:41:01 2026 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 4h4b5n6vDJz6kW0C for ; Wed, 22 Jul 2026 00:41:01 +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 4h4b5n5TpLz3T3Z for ; Wed, 22 Jul 2026 00:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784680861; 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=DGTYIjPHl80AsI5fZNavDS3ewfTTJm+WY6TUnyOfA+o=; b=pk+0hpeO5huRNn3XLcCeV8anj1qgXUO5/ps6Vw9ToSEVc88zzwCIL5q/b2Qr9cZfd53YLU 5dfIj2Sq0C4V3Pw9GaP6dYnL0b4WHJvE5c8R+rj9FNuNDVanBemkzSGlWPNtpsLRTnwcGP VPbvGEaKyqa0XQILiElhHgKybzy5mPqKJSinbBFYnsAwpmeG4XxtK0oRieGmnyHv/GYsMD my4PmwDsxdRLqkjG4A+Pc65D+d5cG0FeC1GA08ucURkkKxeqSmvv78CwXubqyyMMFAzHuc pEkymZ7Z1/80I+vyoEP9DG62XJULKiZtBVY38dSXJfqJ8XWkc8w6m4wxrjvWvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784680861; a=rsa-sha256; cv=none; b=VIZ8suZOKr1GQDJRLhQmORCDAbBtwF2WNcc7PuXIkcWF/o8v33vOV2tzi3CYkSYs+rylIc XCz5Ch3+NOodhZfUvr/CDfwKwLCNNlH45lJpbFzNXBGeH0vochaGQDBn0uWVfUuwsaCISd 1fR3NP/eCImrWtIloffza6OOiBKWH2gkLmX1W7LmhqYT/IzzoDoybszBI6F6IHzqalcbJ1 psziBN3dp+KoSId/zHPT/afGxbgrD1ICk6La6Fb4lru3wlIUl/fIfn5umxIBLOP7i6M4LC gwBRhYLeadhY+2Psqn5bYXoXHvEtYv0FQrXSr0BJazbaBP76GQs7iWINIcI6RQ== 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=1784680861; 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=DGTYIjPHl80AsI5fZNavDS3ewfTTJm+WY6TUnyOfA+o=; b=QU+G9deu+IrbAUeAcci2hvjIohKDnyjHr2qlm9/05zEK8HlInoA9RYT48Gg5FWS0n0NfBz Bami3TQ1fKA8K5x9kd6OfhNFC484kDa/kOFMfjt0K667lBaJmmHUBDxROFS4059V1rNB+9 8HLH71kNFWImyJM6arbUOBMQ4Qjx+NJVEj5rYOaVPiD62E0usUm3pGUQ97bFKmpLTXHSYU 1FpVR+yoEDBdQTTyoQKdH1mBtrqBVYC5WW4O7IOSwzuCuXo1gl6sxDNaiRpaGc2fYgyeY3 n1U/v2ysfErMreMjql6QWdSu4FO6lO+7IE2uyNHdCncnQY0u16kTwbyycqr39Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4b5n4WNVz1BCX for ; Wed, 22 Jul 2026 00:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46479 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Jul 2026 00:41:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5001af647b3b - main - loader: Fix error handling after an allocation failure 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 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/main X-Git-Reftype: branch X-Git-Commit: 5001af647b3b263aeb3d4fa7a6c2690399265202 Auto-Submitted: auto-generated Date: Wed, 22 Jul 2026 00:41:01 +0000 Message-Id: <6a60119d.46479.140bf2fb@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5001af647b3b263aeb3d4fa7a6c2690399265202 commit 5001af647b3b263aeb3d4fa7a6c2690399265202 Author: Mark Johnston AuthorDate: 2026-07-22 00:17:56 +0000 Commit: Mark Johnston CommitDate: 2026-07-22 00:17:56 +0000 loader: Fix error handling after an allocation failure MFC after: 1 week --- 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 2ba5c1419168..592d553094ab 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);