From nobody Wed Nov 11 16:49:57 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 4jPqJ54JYzz70Sr3 for ; Wed, 11 Nov 2026 16:49:57 +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 4jPqJ51bRQz4nCN for ; Wed, 11 Nov 2026 16:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415797; 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=/T8j8Oek/t85/iosZ/kv7e2v/mqPWBduujsdlm5dYXw=; b=OIYaUBbmHHWDT2uPNvUPAVy6YGA4pc81EdwBiXhUxKwcPSE+7/84zmQyUFsIRdjgBnz5Xn i2fBqBquYWoF2JFSb8P9jajFZT3EfmWda6wWdn/XS5tqLqJJbM9lPL0m1y7eXl34SNPePM Uv4386KFJvvmy4MAWUQLRwj/ZljoIjLxf7/jxRlVJARYDkkAQfcKw1DI6M/g+UvuYJCheb v9Azzg+bwT1S/RwPbCOdTyGt9xHKyDSYbJLngGP2xW+N4dgEuB2dRASE1tEqeL2xqqRmtc TtGSS/gi3BYTdnQYecji1fUP4mTWSsfilCg85AMMtx0EImhtnGbdJMG6GZq0RQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415797; b=WkAlzao3V27UH/mdFlXw3x0YWSWqKFfYZ7qcNv4HxylAfCU9eVPKyj1aR0NIc/wpPJBhMn Ml4P0SHV5gyD2UkgvX5r0ni6POb+aUYWzqGGe7bKFySzb69MEylJmMlwDO6ecs6Sd66lHl hiux5eBHrmvhfp6SNIiIx4VBH1eU86frUuAVjZ3o/1vtYthL09SRjjG7mbEApnT9q2NvMz pTnTDTrqzcUd4jokhjJEM9o8+MCOBNC5dDqHZf2KoBdf6UHNQXvWoMrtFytFxCRDIuvs7c Svg3rP8NQlXXqn7eLESPkVEaNYghw/fklDb3o+qTQYr3kEw0CZWwZl94pNThBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415797; 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=/T8j8Oek/t85/iosZ/kv7e2v/mqPWBduujsdlm5dYXw=; b=MU61OOjHfwKb3SGerymG8eHs9TiOu25ToIklEufXOvPF29W+RQXglFqeeXpjclFjIuoGhu OBpiERsZjrbrL76H52ygOM/hok7aAqjdpn87moNPJgJjOt4XpRyHJuFeTRtK15uSBpPUzk dp7cK0ahYY5GsPD5sqnTgRoL/Hwr9qQ01o3rbgYmmqyICPc/fdLwyAunBkutZPH0+w5CAF L84Z7cl8tQZHgvhBkaY2rkts4Loo7R9eDOshZ7oOuIpEnojGCRX3gfxEl7Wp/o2dVHGzSM PH/7nfLkTkwFa9xEjSpiV5f3FwoJBqzJDdceWjT7mAxZd4CgE6VbapKknJ+O7g== 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 4jPqJ50kwFzN77 for ; Wed, 11 Nov 2026 16:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b532 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:57 +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: e4b9fec671b6 - main - link_elf: validate the section headers in link_elf_load_file() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: e4b9fec671b6f45ab18c6292be7586a7d5d9b85f Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:57 +0000 Message-Id: <6af49cb5.1b532.35e69521@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4b9fec671b6f45ab18c6292be7586a7d5d9b85f commit e4b9fec671b6f45ab18c6292be7586a7d5d9b85f Author: Osvaldo Janeri Filho AuthorDate: 2026-11-11 15:04:28 +0000 Commit: Mark Johnston CommitDate: 2026-11-11 16:49:42 +0000 link_elf: validate the section headers in link_elf_load_file() e_shentsize isn't checked, and e_shstrndx, sh_link and sh_name are used unchecked. Do what link_elf_obj.c does. MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61389 --- sys/kern/link_elf.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index c49ecea0bace..785233ec4213 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1098,6 +1098,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, int symtabindex; int symstrindex; int shstrindex; + int shstrsz; int symcnt; int strcnt; char *shstrs; @@ -1105,6 +1106,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, shdr = NULL; lf = NULL; shstrs = NULL; + shstrsz = 0; NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename); flags = FREAD; @@ -1376,6 +1378,11 @@ link_elf_load_file(linker_class_t cls, const char* filename, nbytes = hdr->e_shnum * hdr->e_shentsize; if (nbytes == 0 || hdr->e_shoff == 0) goto nosyms; + if (hdr->e_shentsize != sizeof(Elf_Shdr)) { + link_elf_error(filename, "Unsupported section header size"); + error = ENOEXEC; + goto out; + } shdr = malloc(nbytes, M_LINKER, M_WAITOK | M_ZERO); error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)shdr, nbytes, hdr->e_shoff, @@ -1386,6 +1393,12 @@ link_elf_load_file(linker_class_t cls, const char* filename, /* Read section string table */ shstrindex = hdr->e_shstrndx; + if (shstrindex >= hdr->e_shnum) { + link_elf_error(filename, + "file has an invalid section name string table"); + error = ENOEXEC; + goto out; + } if (shstrindex != 0 && shdr[shstrindex].sh_type == SHT_STRTAB && shdr[shstrindex].sh_size != 0) { nbytes = shdr[shstrindex].sh_size; @@ -1395,6 +1408,21 @@ link_elf_load_file(linker_class_t cls, const char* filename, td->td_ucred, NOCRED, &resid, td); if (error) goto out; + shstrsz = nbytes; + if (shstrs[shstrsz - 1] != '\0') { + link_elf_error(filename, + "corrupt section name string table"); + error = ENOEXEC; + goto out; + } + for (i = 0; i < hdr->e_shnum; i++) { + if (shdr[i].sh_name >= shstrsz) { + link_elf_error(filename, + "corrupt section name offset"); + error = ENOEXEC; + goto out; + } + } } symtabindex = -1; @@ -1413,6 +1441,12 @@ link_elf_load_file(linker_class_t cls, const char* filename, } if (symtabindex < 0 || symstrindex < 0) goto nosyms; + if (symstrindex >= hdr->e_shnum || + shdr[symstrindex].sh_type != SHT_STRTAB) { + link_elf_error(filename, "file has invalid symbol strings"); + error = ENOEXEC; + goto out; + } symcnt = shdr[symtabindex].sh_size; ef->symbase = malloc(symcnt, M_LINKER, M_WAITOK);