From nobody Thu Aug 6 18:04:59 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 4hGFYS6Xsfz6nRk1 for ; Thu, 06 Aug 2026 18:05:00 +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 4hGFYS0Tt7z3kxX for ; Thu, 06 Aug 2026 18:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786039500; 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=no51WeKf2gqFydqauZrfpLw/wD4hacAyQuWvu2mYbSA=; b=L0XgQiYeq20fEZ1OEi5JqdS5RhZG4K7m1Dg2Bgc/gtAoEraSQvwE6dpY6Dvzy4Zm+LnEuT yPYjSFelTwlcIq+H5cER3/4PFIG56XFnbuwbtUmRIQH7X+yU9z4hbFkt207iOYXcW0V1ah nTQROAgsrJYjFtr9asE+Z1xaVm1da2oZTVac/+BqmRf8+5L8bmyklW2VmFQft4Ms/oPl4G M5h421fiIJ7OENNVW+kDL26Xe/vCzCwIPQ0L/6PiNH56x4zoodBIHUUInteNo0QXoLFemi Qxd4Wpy7HC7rTYVPpczWnBjIQ2LaA2dbOYrpP+tABgzbWrqS6/F+eIrqhRQKkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786039500; a=rsa-sha256; cv=none; b=LD5pd3x1vfQFufgMq44KO798iPR4KspPB3Nb/Ump1jBrwZntEhx9S9XNIN5Sf2XQKimW2R gosRDO0OuuRj/yv2cu/KUmyfwhy++z8Lh0Gg5LPQWzfyWD2OTcxT3W9ARKKZHKhGCnQ0JD MEfXJp4ZwfBUxsVRfEqb3nlFGB0UuNbXazboc9d9UPa3s0/Iwmp4KEUkgPeZRJF7bpNcoW nKgPZbLStFQhLo85zx0WwPNfXWe74np4LnSziB5GGbNZlcDCdEVpfldxfr5TXlpaU07I5E mQXseBK8hlzcKn4DigQE8RMbZ43H7IrXenjwKW1RQWTI466LzYmZSEw+Eeojww== 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=1786039500; 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=no51WeKf2gqFydqauZrfpLw/wD4hacAyQuWvu2mYbSA=; b=Eiz/Sb3JqQ2yWP5TQ8zLMrhm/Fvt/AQ1ereaupmyrgDqFA5j5C3I072MpJXpNMVKH7wHFV aLZ4PAAJkagwFRnLsHHOCYU2N8H+SM87OcwAmL6kg/sOpRlc3ROqELfk5OmgXNHaZuSLmj oJmh4kLyhwgLguI/EnNvPhFr9O/5Tgwe17/6Fn1sGAibsdc6hosG308i8Y3wMkSC0Q2fWO BsuAsqpR0WiERKgBXUVhWMoRwMcJxI7Q2Y3CRudjNAM0CPeOGqd5tGzoijDvZ7rlkYxhzH EPOklQOOsYhn5+Usr40JfgvXqlGpXPXHaAYN939bT6e1FoB0EfZc77lV/qI/Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGFYR6b50zX7D for ; Thu, 06 Aug 2026 18:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 18:04:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: f93ab5858523 - stable/14 - link_elf: Make phdrs first page check actually fatal 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f93ab585852341bd5b8635cab1df7020eb677bd8 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 18:04:59 +0000 Message-Id: <6a74cccb.32a04.291707c@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f93ab585852341bd5b8635cab1df7020eb677bd8 commit f93ab585852341bd5b8635cab1df7020eb677bd8 Author: Jessica Clarke AuthorDate: 2026-07-29 14:09:42 +0000 Commit: Jessica Clarke CommitDate: 2026-08-06 18:04:28 +0000 link_elf: Make phdrs first page check actually fatal Otherwise we'll print an error but carry on regardless, presumably destined to walk off the end of the mapping. Reported by: thebugfixers@pm.me MFC after: 1 week (cherry picked from commit 1e39a314d870e312f623199e146eda6bdbc293a3) --- sys/kern/link_elf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index bcce79a8b262..18826b7a6360 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1062,8 +1062,11 @@ link_elf_load_file(linker_class_t cls, const char* filename, */ if (!((hdr->e_phentsize == sizeof(Elf_Phdr)) && (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= PAGE_SIZE) && - (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= nbytes))) + (hdr->e_phoff + hdr->e_phnum*sizeof(Elf_Phdr) <= nbytes))) { link_elf_error(filename, "Unreadable program headers"); + error = ENOEXEC; + goto out; + } /* * Scan the program header entries, and save key information.