From nobody Wed Jul 29 14:11:23 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 4h9Dlc5FmWz6nHd3 for ; Wed, 29 Jul 2026 14:11:24 +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 4h9Dlb6jPLz48Bd for ; Wed, 29 Jul 2026 14:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785334283; 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=3wO05fiWYzsFqtlcz1CyoPWkCX8P7oS/Zynm40RzlWA=; b=wyuvZ85PE0Nk9j1GtMdDp4hSQnw6LVhfjusqvlxWF59dxus4wJTUPHYfLxBx9lnTQlGANr 04djLypEWTEGwqIwSupkIWituXfqDCZXwbYl36OX5LF8HN+jmGmQCqYHQG9SGA/NAse+bT 0naajYEaexS4AbO+ecu8PcqanTt0r8U2/eNedm6FkfS5kypDMshnDxhYDMWwFFOcwfo6oC zPt9yQKXtvKU5vWlXoKWv/cSXJNaREsuDC3sW+ShlQ4RCOubrSK4HZDcLoQoXK8bRyXf9n r15h1AMlNM9rIgTeAPjf61WDskFtgvN7rc4pD43jPpSRt8vSmrlm3XPgoSxa1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785334283; a=rsa-sha256; cv=none; b=aYVBk0sxy29RNZhWI/Hy0LkJ1LZIjV3qdFBrjOCUhHIL5aXKtmuN4467aNTdQxWYqXA/+L Aealph+PqOV+SN6t4dKujzLrJYmNp3F8jTUKfHXHHNYG+somE4QXj2Ymg//wLPVVALEF62 lcrxDE++Mz0dQHkBrZsFUtOyUUWuOSuQ4qw/1ohir6UA6NGwHrjuAXsoT+KH7eVw4FrOsU m1SBZQ4xcqXzWyB4OtzFZb8hwzwCyhLhXVQaGew6uIhoMrOMz7UNn0jLIA6XKKiRzhxA7C JL+6pf75M+Y+CnGKp5TNUoGilHXjnaAHPktB6hEqq3B5JHXhpqQCQ6/XeJbAqg== 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=1785334283; 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=3wO05fiWYzsFqtlcz1CyoPWkCX8P7oS/Zynm40RzlWA=; b=HmJBmek5/ebB037dFOW4TD5C98Plnnn67ADhHSlLn83QU83rQfrVCQNbmWYQKKFGh9j+Cv s13Axczs4jx8wxzIAygk2mtCvXHsMZL5JG59TQjy2Jjie+ro5D2PzRLFMqZ5160CAg9Llc yKEIRZfj8KMn9qsyufR/bQRVi5kFoT9wEpFRS7wzgd2vFWVGF5xKZ1m4XW2twLGu6a8qpU XnbEiTNHteoCCl6PZzz2RytRNH1f738GuB0QS1P0W+bxHcZSbqUzSNBDNhSzbw8JYbBAW5 rVE7tHiKvnr0RHl4l2eMF5qF9prELgrMbYPlECY/AicdPO+F1gZn9X2DyB8LSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9Dlb5mMQzTqL for ; Wed, 29 Jul 2026 14:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 14:11:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1e39a314d870 - main - link_elf: Make phdrs first page check actually fatal 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e39a314d870e312f623199e146eda6bdbc293a3 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 14:11:23 +0000 Message-Id: <6a6a0a0b.197de.5185cb8b@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1e39a314d870e312f623199e146eda6bdbc293a3 commit 1e39a314d870e312f623199e146eda6bdbc293a3 Author: Jessica Clarke AuthorDate: 2026-07-29 14:09:42 +0000 Commit: Jessica Clarke CommitDate: 2026-07-29 14:09:42 +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 --- 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 613dfe0133d4..6ab5f4a39580 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1086,8 +1086,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.