From nobody Wed Nov 11 16:49:54 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 4jPqJ326Mcz70SgJ for ; Wed, 11 Nov 2026 16:49:55 +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 4jPqJ30wJlz4mwY for ; Wed, 11 Nov 2026 16:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415795; 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=9dmRRujZB8YLEEw+syd1uF8E3w0Yc44MrOSFByi+vao=; b=ywu6VLT6OngyVUvkv0LGizt5XjnNV6a9Btp5e/iP9j/vIkTt0+x/5/OZKXJ3b+UEwQ4Lor Xl9LWbS4ujJKfq8077cdo97lmLaOwTECt7FNHdJfM4OUNEIxrSUpeZejFyWtbvGzPKfWlq lwdrq/urtD1SPM3BM/2zhSSVmX+pbBkLMKlN13tXO07lsiJQgAA2FLC3edDc5eIaMBpSPK jEb85HiAxjaDKG/OVHv4NIVVeGMr6YfScW0eGRvYmZQi2wus8L/lYY+Dn+8WKcMKUQBj5z u5X3NqtCMNBhuA+WjDuWusdiB+8b22VM5tyIGchloHsJm3biJVJGu4fnGngZxA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415795; b=kCRNzshJQlxYHqXi2mx2bZH5gOD5J4Re/N2o1EMavdFX39l5sQraUaafcWQ0zGO8VMtKYO hFh5XGxKdRDsCtx2MjF1EjOffBw6xgWZ0m2UjDxQn9/Gpng19wmNfnqMJrBL2TucfXnurZ 0qaxf+NKuFC62HuqvxRJ/QbkKDTcWYldEPWXEo5ux07GjrHgTaq49+SK4wQvn24LDaqMTc SUAHJS3whLS14GgIDCUPTf2Rjs0dCn+lhoU15kZGZQ0Q5JLYQEgYHhmneKfl2vvTtfaaM/ m5PUhwuAyu9GW9LtvKKACLJyF0w2ZqgTqikmX1KGsqTdiTftiiQwZbznBVIASQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415795; 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=9dmRRujZB8YLEEw+syd1uF8E3w0Yc44MrOSFByi+vao=; b=H6m1X6WHU/mpayg2tf+i3+qwrtsMBh4QOuTseZe8EFU/XBJXVaWx4TfcT9MCJWw8gq4ieA 5tAnpV9rhe/R3PhjhW7bPXG+dGZHWgRz189nfKkC8oNPSFZ/U4JZIzfJoSeyYNVYRqG1fJ /Kz1kw0j9vCDermaqzc5oOuAXBv4GxQ5eHFgW5N50NHrKm9kb1YsoN+6RORm4HfQqVf1E5 hN6RolFSIw0TdfJxuzI/9mJPbeztTaNPfQRSwgwTuVJdeVUdUOzkSW/2B//Ci1sQVqh3p1 B4zuIZ+9qYraRM0Dt9mw4rdTnsykDpVmxm3wJTXQidJ52ST6JKB0nMTu958wVA== 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 4jPqJ26v5fzN74 for ; Wed, 11 Nov 2026 16:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b5a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:54 +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: e0f08341a68e - main - link_elf: bounds-check the dynamic section's tables 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: e0f08341a68e64111b58eac3cbe21f57c3840178 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:54 +0000 Message-Id: <6af49cb2.1b5a8.354df753@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e0f08341a68e64111b58eac3cbe21f57c3840178 commit e0f08341a68e64111b58eac3cbe21f57c3840178 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-11 14:43:02 +0000 Commit: Mark Johnston CommitDate: 2026-11-11 16:49:42 +0000 link_elf: bounds-check the dynamic section's tables parse_dynamic() only checks the DT_HASH header. nbuckets, nchains and the other DT_* tables come from the module unchecked. Check them against the mapping, and reject a size without its table. Reported by: llm-postcr MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D61387 --- sys/kern/link_elf.c | 104 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 27 deletions(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index c04bd63f58ff..0fd1e8c36688 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -585,69 +585,82 @@ link_elf_preload_parse_symbols(elf_file_t ef) return (0); } +#define DYN_ABSENT ((Elf_Addr)-1) + +static bool +dyn_table_ok(elf_file_t ef, Elf_Addr off, uint64_t len) +{ + /* The kernel's own dynamic section is parsed before its size is set. */ + if (ef->lf.size == 0) + return (true); + if (off == DYN_ABSENT) + return (len == 0); + return (off < ef->lf.size && len <= ef->lf.size - off); +} + +static caddr_t +dyn_table(elf_file_t ef, Elf_Addr off) +{ + return (off == DYN_ABSENT ? NULL : ef->address + off); +} + static int parse_dynamic(elf_file_t ef) { Elf_Dyn *dp; + const Elf_Hashelt *hashtab; + Elf_Addr hash, strtab, symtab, got, rel, jmprel, rela; + Elf_Size strsz, relsz, pltrelsz, relasz; int plttype = DT_REL; - for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) { + hash = strtab = symtab = got = rel = jmprel = rela = DYN_ABSENT; + strsz = relsz = pltrelsz = relasz = 0; + for (dp = ef->dynamic;; dp++) { + if (!dyn_table_ok(ef, (caddr_t)dp - ef->address, sizeof(*dp))) + goto bad; + if (dp->d_tag == DT_NULL) + break; switch (dp->d_tag) { case DT_HASH: - { - /* From src/libexec/rtld-elf/rtld.c */ - const Elf_Hashelt *hashtab; - - if (ef->lf.size != 0 && - (dp->d_un.d_ptr >= ef->lf.size || - ef->lf.size - dp->d_un.d_ptr < - 2 * sizeof(Elf_Hashelt))) - return (ENOEXEC); - hashtab = (const Elf_Hashelt *) - (ef->address + dp->d_un.d_ptr); - ef->nbuckets = hashtab[0]; - ef->nchains = hashtab[1]; - ef->buckets = hashtab + 2; - ef->chains = ef->buckets + ef->nbuckets; + hash = dp->d_un.d_ptr; break; - } case DT_STRTAB: - ef->strtab = (caddr_t) (ef->address + dp->d_un.d_ptr); + strtab = dp->d_un.d_ptr; break; case DT_STRSZ: - ef->strsz = dp->d_un.d_val; + strsz = dp->d_un.d_val; break; case DT_SYMTAB: - ef->symtab = (Elf_Sym*) (ef->address + dp->d_un.d_ptr); + symtab = dp->d_un.d_ptr; break; case DT_SYMENT: if (dp->d_un.d_val != sizeof(Elf_Sym)) return (ENOEXEC); break; case DT_PLTGOT: - ef->got = (Elf_Addr *) (ef->address + dp->d_un.d_ptr); + got = dp->d_un.d_ptr; break; case DT_REL: - ef->rel = (const Elf_Rel *) (ef->address + dp->d_un.d_ptr); + rel = dp->d_un.d_ptr; break; case DT_RELSZ: - ef->relsize = dp->d_un.d_val; + relsz = dp->d_un.d_val; break; case DT_RELENT: if (dp->d_un.d_val != sizeof(Elf_Rel)) return (ENOEXEC); break; case DT_JMPREL: - ef->pltrel = (const Elf_Rel *) (ef->address + dp->d_un.d_ptr); + jmprel = dp->d_un.d_ptr; break; case DT_PLTRELSZ: - ef->pltrelsize = dp->d_un.d_val; + pltrelsz = dp->d_un.d_val; break; case DT_RELA: - ef->rela = (const Elf_Rela *) (ef->address + dp->d_un.d_ptr); + rela = dp->d_un.d_ptr; break; case DT_RELASZ: - ef->relasize = dp->d_un.d_val; + relasz = dp->d_un.d_val; break; case DT_RELAENT: if (dp->d_un.d_val != sizeof(Elf_Rela)) @@ -666,6 +679,39 @@ parse_dynamic(elf_file_t ef) } } + if (hash != DYN_ABSENT) { + /* From src/libexec/rtld-elf/rtld.c */ + if (!dyn_table_ok(ef, hash, 2 * sizeof(Elf_Hashelt))) + goto bad; + hashtab = (const Elf_Hashelt *)(ef->address + hash); + ef->nbuckets = hashtab[0]; + ef->nchains = hashtab[1]; + if (!dyn_table_ok(ef, hash, (2 + (uint64_t)ef->nbuckets + + ef->nchains) * sizeof(Elf_Hashelt))) + goto bad; + ef->buckets = hashtab + 2; + ef->chains = ef->buckets + ef->nbuckets; + } + if (!dyn_table_ok(ef, symtab, (uint64_t)ef->nchains * + sizeof(Elf_Sym)) || + !dyn_table_ok(ef, strtab, strsz) || + !dyn_table_ok(ef, got, got == DYN_ABSENT ? 0 : sizeof(Elf_Addr)) || + !dyn_table_ok(ef, rel, relsz) || + !dyn_table_ok(ef, jmprel, pltrelsz) || + !dyn_table_ok(ef, rela, relasz)) + goto bad; + + ef->strtab = dyn_table(ef, strtab); + ef->strsz = strsz; + ef->symtab = (const Elf_Sym *)dyn_table(ef, symtab); + ef->got = (Elf_Addr *)dyn_table(ef, got); + ef->rel = (const Elf_Rel *)dyn_table(ef, rel); + ef->relsize = relsz; + ef->pltrel = (const Elf_Rel *)dyn_table(ef, jmprel); + ef->pltrelsize = pltrelsz; + ef->rela = (const Elf_Rela *)dyn_table(ef, rela); + ef->relasize = relasz; + if (plttype == DT_RELA) { ef->pltrela = (const Elf_Rela *)ef->pltrel; ef->pltrel = NULL; @@ -679,6 +725,10 @@ parse_dynamic(elf_file_t ef) ef->ddbstrcnt = ef->strsz; return elf_cpu_parse_dynamic(ef->address, ef->dynamic); + +bad: + link_elf_error(ef->lf.filename, "invalid dynamic section"); + return (ENOEXEC); } #define LS_PADDING 0x90909090