From nobody Wed Nov 11 16:49:56 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 4jPqJ448dCz70SZD for ; Wed, 11 Nov 2026 16:49:56 +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 4jPqJ411Wjz4n6h for ; Wed, 11 Nov 2026 16:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415796; 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=BLb22dwK++D9k27fbKl5ljkCV+9xbPm2PUkW8J1C1s4=; b=gIb4UB0a14h8BLub9mw3VPsrcH/SLFhQyF7NSFCSSgrPsd2zag4ENNSzg0s5svHAeu7NU5 a6L1ZhAJ0tCw73xbQIx1aSVDr4ow4CSFFBzlCbhB8dfHJwjMKFi20fhSKojTm57OcAFUt0 yprpl+xeXLnChhF7sF+sbnxm3yAH39VRUCkqv/3VtGmCsWXMIdFIl4qG+qy1PI+qdM3rOa +xfE362RDzPbFHXlYQYalEKU/5Tm75yVxpLAqpCatiDYU8u5jDmYsnSD9+0RfvAjXeARBW 8Y5e+0noGa5F2LXbfavZ7fcOHUJM4xol4qQPqrP3e2fvPVl14+/9AjPEidexyw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415796; b=fLQwyjVPgYFZmQ4aLoDwwekvAfBfcvK0eignvcAHOVl3gZGQwU2FlyQ7hiNzRtcP9od8xL 98RhiKUTED0BnK/8IJtN8ExaXCqJL8RC9KGx0JvIT2vXICCHJjSctodx9wK3mVCl5swpnb SC7HIwBEsQTCobRsJ2QWbbZL0UysOGHesS1dM1vSkQN1xbLfWz6K81un0PGFVcy0TkG5WS cWX5VkQ/55+Q0Ek1/zyqQD3EyHIKdMuMHjbULxKM8w843qrf2HduxQov8ZhDIGlrzcaB7r U0Mfsvm0o+r6P0pzjmpoCuH0K+55TLEd5cFHx+w7EzOm0Mdm2RF2PmXhWTNE6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415796; 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=BLb22dwK++D9k27fbKl5ljkCV+9xbPm2PUkW8J1C1s4=; b=PGYe89osA58Ga0nkv2PVGG0Pg9VE1yhyi8qCI3gNxGA+b2rFoRc4NUws/zA1HW9MJCo8ck n6PX0uJRKPjlvF/JsJFMwImpNt+b4HcywWMjkH4vYpuFQ7M/6cBzSYW6Ou/1DKIhYhckD3 6VTekOzVIZa/W+qXFbueqdUY3lNniiHZ0eNDtRUOZU41CU3ywWRqqjplpn/I1W1UCQ2hsa jP64QbjfiJTtTqzOI9sAgW9sXX+yNJidB+mkvjfzSBPjxn8CxRWvxLFEKjMXaKh5G/cGVS 4A6lTy8lDKJaWB8O19n6etjpA3NH8z9AygAVX/3j6bVwuD6jW8XTAH1a1Op0CQ== 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 4jPqJ40Ht5zMSR for ; Wed, 11 Nov 2026 16:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d287 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:56 +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: 35d9a9b2fa47 - main - link_elf: validate symbol name offsets 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: 35d9a9b2fa4796a7e7a9c3bf17547e66007e6b14 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:56 +0000 Message-Id: <6af49cb4.1d287.5cf01d66@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35d9a9b2fa4796a7e7a9c3bf17547e66007e6b14 commit 35d9a9b2fa4796a7e7a9c3bf17547e66007e6b14 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-11 14:58:04 +0000 Commit: Mark Johnston CommitDate: 2026-11-11 16:49:42 +0000 link_elf: validate symbol name offsets st_name isn't checked against the string table size, for any of the symbol tables used here. Do what link_elf_obj.c does since 4e2c2842e. Reported by: llm-postcr MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61388 --- 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 0fd1e8c36688..c49ecea0bace 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -532,6 +532,27 @@ link_elf_init(void* arg) SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_THIRD, link_elf_init, NULL); +static int +link_elf_check_symtab(const char *filename, const Elf_Sym *symtab, + long symcnt, const char *strtab, long strcnt) +{ + long i; + + if (symcnt == 0) + return (0); + if (strcnt <= 0 || strtab[strcnt - 1] != '\0') { + link_elf_error(filename, "corrupt symbol string table"); + return (ENOEXEC); + } + for (i = 0; i < symcnt; i++) { + if (symtab[i].st_name >= strcnt) { + link_elf_error(filename, "corrupt symbol name offset"); + return (ENOEXEC); + } + } + return (0); +} + static int link_elf_preload_parse_symbols(elf_file_t ef) { @@ -577,6 +598,10 @@ link_elf_preload_parse_symbols(elf_file_t ef) return (EINVAL); } + if (link_elf_check_symtab(ef->lf.filename, symtab, + symcnt / sizeof(Elf_Sym), strtab, strcnt) != 0) + return (EINVAL); + ef->ddbsymtab = symtab; ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); ef->ddbstrtab = strtab; @@ -719,6 +744,10 @@ parse_dynamic(elf_file_t ef) ef->pltrelsize = 0; } + if (ef->lf.size != 0 && link_elf_check_symtab(ef->lf.filename, + ef->symtab, ef->nchains, ef->strtab, ef->strsz) != 0) + return (ENOEXEC); + ef->ddbsymtab = ef->symtab; ef->ddbsymcnt = ef->nchains; ef->ddbstrtab = ef->strtab; @@ -1403,6 +1432,11 @@ link_elf_load_file(linker_class_t cls, const char* filename, if (error != 0) goto out; + error = link_elf_check_symtab(filename, (const Elf_Sym *)ef->symbase, + symcnt / sizeof(Elf_Sym), ef->strbase, strcnt); + if (error != 0) + goto out; + ef->ddbsymcnt = symcnt / sizeof(Elf_Sym); ef->ddbsymtab = (const Elf_Sym *)ef->symbase; ef->ddbstrcnt = strcnt;