From nobody Mon Nov 09 23:43:34 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 4jNmZH1vClz70hVY for ; Mon, 09 Nov 2026 23:43:35 +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 4jNmZG3cCCz3HsF for ; Mon, 09 Nov 2026 23:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794267814; 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=ukTnUiifvkaXJqvuGt1hPvB6KO/Auuo69cQecZX0wpA=; b=R816/6DUSBWO3EkgyhEZDuHUDN5PNuhoK+F0o5+qr51uqNO5PSgI4MyLF7P0uo9TQ4W/Ll OG3UFw/JcfEhM0OHPLaHRCiJEKPKeYZwP/OPr0hyAKAHpfvdT9e0sMJ7PbgLxAzGG/MnaL VgrwwDrzbLBL6qrep3++3VhJnaP3ZU9vmqTJt83WFJH+cn8nsBtDcRIMBWzPlrR3cGWB0K Y21PXk1CqVQERNeqnyzdxhjF+rtMrPzFaE1MQu0JmTRCo4UFjFZuZ6Avkn3ImwRi53WG6Q 5LNzo251m30e+qROC7ozlYhp1vfsxEDoyKK5rCPsm3qtt+tceg1vKMHiMIgtdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794267814; b=Y2ufk2W44YSjKfF/xkSfxIvChDyMGmTETzhknj0jngegi2sWnafgq9puk+GQwob0vm9QCk q6phxnra2PZrWazGL4xx8dNqOK2c1VA2GhU4tWAMB2ecUp5onhHWnJiL/eb64Rls0oqqNs PVcINRNVUULstgBZoukwvenczlA7oWBvu/eepfZIgRHlkdupZMwTxLQfP/JikdYBeZ65bf r8eeCJWjWbHpG9gdSdY8pg4FgB+8Lfa6YQBYzQ0/0KGWv3V0Dm4NmVWPcYN1PSf+yqVotm YwzyD7Nl+n5Zn3GOAep2B6zcErXMBzI6nMzrXaoTsg1fIXp2qW7xKK2mk/RUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794267814; 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=ukTnUiifvkaXJqvuGt1hPvB6KO/Auuo69cQecZX0wpA=; b=O5uQMv/HE9tjD2zOA4d2Nn989YhJt9bokFeqt/COJzo5CngcPYvLgOblXqksJ2vCYTvxXr CAQOQk+Ejn46haUZbyOd68+VZRtZdHgtQMm8kYfD6fW4kdu59473xqd5HaeZ349jnk4ptb +kxDPD0WsrvP9K/b8PstaWyPlLBEzTF8UwdGaUYubzSfYKG1KlLRK4AgjyX7RO9L09V8u/ Vs1aadLBi0B+y16JiIWqBKWhmj0BwNsq9poLhMqqAiYfxLjNaHUwgMEwUR14n6veut8awL 9mtepDG/ElP7ycWPNvLgTZ8FPeY4tdm6BOj0UmJLiF6Ccys3YARk11b/lkhZNA== 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 4jNmZG2t4xz12pB for ; Mon, 09 Nov 2026 23:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b497 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 23:43:34 +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: ad8f475be2c5 - main - link_elf: bounds-check the DT_HASH offset 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: ad8f475be2c5920f9a90145c071cba390a4ec6d2 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 23:43:34 +0000 Message-Id: <6af25aa6.b497.4429806f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad8f475be2c5920f9a90145c071cba390a4ec6d2 commit ad8f475be2c5920f9a90145c071cba390a4ec6d2 Author: Osvaldo Janeri Filho AuthorDate: 2026-11-09 23:18:40 +0000 Commit: Mark Johnston CommitDate: 2026-11-09 23:43:17 +0000 link_elf: bounds-check the DT_HASH offset parse_dynamic() builds the symbol hash table at ef->address + d_ptr without checking that d_ptr lies within the mapped image, so a crafted DT_HASH entry causes an out-of-bounds read of the hash header. Reject the object with ENOEXEC when the header does not fit in the image. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D61323 --- sys/kern/link_elf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index d7aeefa25433..c04bd63f58ff 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -596,7 +596,14 @@ parse_dynamic(elf_file_t ef) case DT_HASH: { /* From src/libexec/rtld-elf/rtld.c */ - const Elf_Hashelt *hashtab = (const Elf_Hashelt *) + 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];