From nobody Mon Nov 09 23:43:32 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 4jNmZD4tbsz70h5d for ; Mon, 09 Nov 2026 23:43:32 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNmZD30snz3HvR for ; Mon, 09 Nov 2026 23:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794267812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsI+P+A3acRM8O5mLsLnYWuXUW+uK7Ts4U9H9g2eExk=; b=sGKmChzOt95nJevrlYTyuwdhNHakumXJrkHa6SRq9Wu9ccLpl2Ir4iXZ2tfcKfwQbKaKre ikDmA9T74YeFQY9PJwxrfoSlk7+UIOIs0dSMfk1eGIz/dpM3whe7FZY/cmJ5XkhA/ZNz0H zwNfIYcmPX4hKjLCRHzscPmPDeyBTbzCy5EtiWtRxR2pobZbgBlCAtMhxtb5ErPMYDtjMf W7GDwZ8Z89aqMDTLldPTZuTatfueoaVq5Id+feJU96USaf9kVaxV8Xdm9XCgyX7Fpa5gCL fbEIL2uTwqe/VZjf1RAeAkjdzIL9xDVa6Cu6p54bwYi6YEsk7fZTgA/XuuPCzQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794267812; b=rBPjIbqFe1QV4m6hYlRD0iXAUQtx7mBCSW00ZPS07kMZtcxJalNrMHcCEm3ouYvsNuUejC MIEx+698kZ+Y9dDyO7XvYWYlDgWlsj6XjKALSFgmFvC0umxoy5wElSseqNhBuwCqW0Qz0+ fwaZENXIa2GOK42g+C4joj5nYDFMM0C7B52aLCGsl5hjp9RYP8c2fERHPM7+FqkP5lh8WZ ohFvFze6G8l+QISkCBrhvOZrDMhGzZDuGxIdcNg9fcHTe/H6FmElTgCYeSTbZh0GLx67XB lohY9nYeWdRN44QcntliuyUybc8ZUN0pXFK2qQh8vvhD57QSUPg++5b07huUpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794267812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsI+P+A3acRM8O5mLsLnYWuXUW+uK7Ts4U9H9g2eExk=; b=LTmicPpv24MoFD3iaMnD9GFgiQ6If2UyjcH2vetBMadH+jBfqr8RHRDJEfXT4PSw/DrW19 pdbOcTKhoxDPO9FSEgW4wpwGJ7CKisNKQ1SzBGMGtY3Mc4I6TqrLtRpEhMsX1n/tOYWLQD aU+IG94PBRsap7QujOZgWDb4g+lLeOu9mCVpF7+QbE21C0xtYSAfK4e9VlQbwgzLy5W/+I lVCwprhhARfeOv8VWkgJp0D8Qx1DwP6uC3IoleR2EidAGb2/fotDO0TmpHl80VBDe4effa RXbCEnoadSh5NMxqNW7909lA6Gs47fx/FZL0tTCukemWEF//zOqSzT6baRYzhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNmZD2GYtz12p7 for ; Mon, 09 Nov 2026 23:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9743 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 23:43:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mark Johnston Subject: git: f0683276b433 - main - link_elf_obj: bounds-check e_shstrndx in link_elf_load_file() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: f0683276b4334f4b7e7faf73471a2afe937a9f5d Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 23:43:32 +0000 Message-Id: <6af25aa4.9743.3b657b27@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f0683276b4334f4b7e7faf73471a2afe937a9f5d commit f0683276b4334f4b7e7faf73471a2afe937a9f5d Author: Osvaldo Janeri Filho AuthorDate: 2026-11-09 23:18:01 +0000 Commit: Mark Johnston CommitDate: 2026-11-09 23:43:17 +0000 link_elf_obj: bounds-check e_shstrndx in link_elf_load_file() e_shstrndx is used to index the section header array after only being checked against zero, so a malformed object can make the linker read up to about 64K entries past the end of shdr[]. Reject such a file with ENOEXEC, as link_elf_link_preload() already does. Reported by: llm-postcr Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61321 --- sys/kern/link_elf_obj.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 63078e225dcf..24eaba8f2ace 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -951,6 +951,12 @@ link_elf_load_file(linker_class_t cls, const char *filename, } /* Do we have a string table for the section names? */ + if (hdr->e_shstrndx >= hdr->e_shnum) { + link_elf_error(filename, + "file has an invalid section name string table"); + error = ENOEXEC; + goto out; + } shstrindex = -1; if (hdr->e_shstrndx != 0 && shdr[hdr->e_shstrndx].sh_type == SHT_STRTAB) {