From nobody Sun Nov 08 16:18:29 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 4jMyl95XWmz6ybZQ for ; Sun, 08 Nov 2026 16:18:29 +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 4jMyl94G6Wz4Gh2 for ; Sun, 08 Nov 2026 16:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794154709; 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=+9UK8tmZK4dhN6N0AM85CGgrl+QeVqOj5C2ds6eqLMo=; b=r9IOA/mkgFsmQnwdmhgWx38T5Egcy6FaZGjLDOb3dZjUoNeFeSAPWoIBvHCmYcqHaVEH0W 78DEuZCPWnhVFMNS0No9BuO038AYJpGCOKQ4AYD0P/NrvRT0EhwMQiob4e4egLQ0PDBn6C q3gU9Y13cCheYuYBi/D+gTZGU+aKNgUfIPjgNHEWSzVI+xSsY6VQ/by4Arx4uMe+UfODh9 hTdmI9jl6wkXgrjIp6Ir/eGCT6pF/bZuoKKYyVh9pvy1ptQOg+vX2uQ8q93ct4mZpzK49V KBwYrTaJDzlXfzjiFFFD4YFXTrj7KTybD4YLRzzJDl7o/vhUNcFyrGPkdzQfOw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794154709; b=D1ZoJ2MMM/g3HmWRq2qgfTJP29Rg9Og+Oba5MAhJhVx0M3dp7iZs1wQx3rZ1hAumMzIsGL /BjL8ohJh+bhguB4kIqf8avgH0WTSLTx3WlICrJWncXOHEwc3kZTvUwJZ+LJT5PBA8KweA auV6pwbfm446x2eu7DxPdDx9aEpH+JrL6Nbat7gIJB+5gTVdmya+fw2fj/GrXLzTk07DuC FGIggiIDPZgrWo7KXI5+MLVl1TCr2KXZttJ8+TR7KsJDUPtxDzRttxa83Bs43U792lMuAa 6kX8mDXgWv/xv4yOQ2DNPddbtSMdWudRChL6AjZO7kzaLW5tcSF4jNlEfmDhXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794154709; 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=+9UK8tmZK4dhN6N0AM85CGgrl+QeVqOj5C2ds6eqLMo=; b=i6aIc95LD1hd1Eo8JrcIUO//UFDMFJR95elqIWKSNfuizZNVkiZkfqFFvhNdRWp99rusCB tooeYHf0D2YP01I7WB8y1SvKFtErYLlvuIuyivAQ1RWrUhQ+RVcx4/P/FL50LmfMIoxL84 wT6u5L3BU54izoKBc1bMGunkxGpcMO7RijGF5CutS4bRa8TsysPyV1M7eIomJkqf64nyOc WkaaQNjiQpt6fQg7OTczDOI+HME0hoKDyLz4PKxRbVXDXVYpliEDh4Lpj80QYU9sKYE/kY +7NhXby/fLCXUTpTuJa2ZeWTQyNi2sGtN7VcsoGarnHxQSz2dM7IndD8DJFs4Q== 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 4jMyl9311gz1DLj for ; Sun, 08 Nov 2026 16:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1366b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 16:18:29 +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: 8644c3bfe240 - main - link_elf_obj: bounds-check a relocation section's sh_info 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: 8644c3bfe2406d00235c4d242022fc7bd61e2276 Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 16:18:29 +0000 Message-Id: <6af0a0d5.1366b.417ddbdd@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8644c3bfe2406d00235c4d242022fc7bd61e2276 commit 8644c3bfe2406d00235c4d242022fc7bd61e2276 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-08 15:43:44 +0000 Commit: Mark Johnston CommitDate: 2026-11-08 16:18:13 +0000 link_elf_obj: bounds-check a relocation section's sh_info sh_info is used to index the section header array without checking it against e_shnum, so a malformed object can make the linker read out of bounds. Reject such a file with ENOEXEC in both the preload and kldload paths. MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D60937 --- sys/kern/link_elf_obj.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 511a44006f03..5be78aa147bd 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -397,6 +397,14 @@ link_elf_link_preload(linker_class_t cls, const char *filename, symtabindex = -1; symstrindex = -1; for (i = 0; i < hdr->e_shnum; i++) { + if ((shdr[i].sh_type == SHT_REL || + shdr[i].sh_type == SHT_RELA) && + shdr[i].sh_info >= hdr->e_shnum) { + link_elf_error(filename, + "file has an invalid relocation section"); + error = ENOEXEC; + goto out; + } switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: @@ -836,6 +844,14 @@ link_elf_load_file(linker_class_t cls, const char *filename, for (i = 0; i < hdr->e_shnum; i++) { if (shdr[i].sh_size == 0) continue; + if ((shdr[i].sh_type == SHT_REL || + shdr[i].sh_type == SHT_RELA) && + shdr[i].sh_info >= hdr->e_shnum) { + link_elf_error(filename, + "file has an invalid relocation section"); + error = ENOEXEC; + goto out; + } switch (shdr[i].sh_type) { case SHT_PROGBITS: case SHT_NOBITS: