From nobody Mon Jul 27 19:15:00 2026 X-Original-To: dev-commits-src-branches@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 4h87Zr4pVcz6nQ9y for ; Mon, 27 Jul 2026 19:15:00 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h87Zr25bgz3fN7 for ; Mon, 27 Jul 2026 19:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785179700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYk6xvRlbFP+1ZOwIb7WRs96y0yo6e2ZTovcDIFGBW8=; b=COqp87zU9pxLA/q1Zw2lpGr1m2yO5g+NzF+LdO3pDaKgRl1F9XuHLA8V52E5j/ZO1yjIFq oOi6Y7tS+RHo30cebENGD2hbC/bHsebVlNidQX8lAH5MTvMTHKTKQGAvrlkgujuhdWBB/Y i6TKcVpXrzVYgDufclX+3IhGjDIBBMz7xYIA8o9haODBDlqCLD6S9+A03PaYK+VSGi8coj D+pH8uF7G2k4GU8Hr4soPZ6y9hBt9JrrnrgoRKFL640a3+QUvfGLp7tbo3telrxbDEXc6w QUoB74hxY43pbzRji5MSvjadonaahXZnUO9P18efKYJCX9NOcB1DKu9vZVNXog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785179700; a=rsa-sha256; cv=none; b=jXqjPut1Pvrcg5h/lGBTlGKcyjk1ZQAARIQDuFgRj9SxCvwqkq/Q9FRHgWC4+C1GMGuQai 3ifV3cm/xqJKE4iebUSHukmDZV5Jb5zshLSB/uVYYFa1HnxIh68X5MydxlWNo7fpelTh9W vzNlHqDxcpjbE8cCTqMDVtzW/dWErvPY0/rVJBxLXSf4hlOsLcsxbkxeZv003hUhWuvRU1 Le2jsCc4qfcUmxOwuGH/xaD4uHAHKOnl5CKnmdd3HtFbxrxf64w7kIyXurxODVLGEySQ8C 5QVVerHt5t1NTvsvib5B+dLZJGGU/MzRCpUQ2olg4XfrxdrcWyMZn90s4zHmYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785179700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYk6xvRlbFP+1ZOwIb7WRs96y0yo6e2ZTovcDIFGBW8=; b=dWmauEKoU+IzRALs70a5CyW1EpY+91eRaoY7xAlY/wg1PyjPbzc780UFJYhlW82/WQ2s2V xAHsSqApSJ47S1BdjS4YSw/clOqYYgN3nI8anlh9aZxXOnAF9EwXoijAsoNtIGjPWXFhPY QoMJHbTQU6tiMMByOIfOxcWSEvrBBeIKteML+Izw/uAg5i5lDmA1jnayZSPqyJ6jCz158y 0l+3VhrAfpmb+LFm1PcUEgC314yq8TieoABNwEIyGM0f5k+cuDL6VOiZ7YAwkdO1ldtnBD WbpQu+27lNoUDJbO7O9+RYEpCW2bsKt8IXi9N420ZsXEqffd+wy1iSDFj+TCwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h87Zr198pz1L3N for ; Mon, 27 Jul 2026 19:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 392f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 19:15:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fc14b7cb9f13 - stable/15 - dtrace: Fix DOF section-specific validation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fc14b7cb9f133572c6bbf48c72de59692bee7f31 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 19:15:00 +0000 Message-Id: <6a67ae34.392f9.2a3cd414@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc14b7cb9f133572c6bbf48c72de59692bee7f31 commit fc14b7cb9f133572c6bbf48c72de59692bee7f31 Author: Mark Johnston AuthorDate: 2026-07-06 13:21:43 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 17:34:31 +0000 dtrace: Fix DOF section-specific validation The entry size of the probe section is assumed to be at least sizeof(dof_probe_t) by the loop further below. enoff_sec->dofs_entsize was not being validated at all. When multiplying an index by a table entry size, make sure the multiplication can't overflow. Fix an off-by-one when validating the translated probe argument array. Make sure that the probe argument argvs are valid string offsets even if the argument count is zero. Reviewed by: christos MFC after: 2 weeks Sponsored by: CHERI Research Centre Differential Revision: https://reviews.freebsd.org/D57979 (cherry picked from commit 7f5fa76367d78e47d483fdf2cc72e5823d0f7807) --- .../contrib/opensolaris/uts/common/dtrace/dtrace.c | 30 +++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index ff31d806664b..11d499953c85 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -16260,7 +16260,8 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) } if (prb_sec->dofs_entsize == 0 || - prb_sec->dofs_entsize > prb_sec->dofs_size) { + prb_sec->dofs_entsize > prb_sec->dofs_size || + prb_sec->dofs_entsize < sizeof (dof_probe_t)) { dtrace_dof_error(dof, "invalid entry size"); return (-1); } @@ -16285,6 +16286,11 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) return (-1); } + if (enoff_sec != NULL && enoff_sec->dofs_entsize != sizeof (uint32_t)) { + dtrace_dof_error(dof, "invalid entry size"); + return (-1); + } + arg = (uint8_t *)(uintptr_t)(daddr + arg_sec->dofs_offset); nprobes = prb_sec->dofs_size / prb_sec->dofs_entsize; @@ -16325,7 +16331,7 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) if (probe->dofpr_offidx + probe->dofpr_noffs < probe->dofpr_offidx || (probe->dofpr_offidx + probe->dofpr_noffs) * - off_sec->dofs_entsize > off_sec->dofs_size) { + (uint64_t) off_sec->dofs_entsize > off_sec->dofs_size) { dtrace_dof_error(dof, "invalid probe offset"); return (-1); } @@ -16347,7 +16353,8 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) } else if (probe->dofpr_enoffidx + probe->dofpr_nenoffs < probe->dofpr_enoffidx || (probe->dofpr_enoffidx + probe->dofpr_nenoffs) * - enoff_sec->dofs_entsize > enoff_sec->dofs_size) { + (uint64_t) enoff_sec->dofs_entsize > + enoff_sec->dofs_size) { dtrace_dof_error(dof, "invalid is-enabled " "offset"); return (-1); @@ -16366,13 +16373,17 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) if (probe->dofpr_argidx + probe->dofpr_xargc < probe->dofpr_argidx || (probe->dofpr_argidx + probe->dofpr_xargc) * - arg_sec->dofs_entsize > arg_sec->dofs_size) { + (uint64_t) arg_sec->dofs_entsize > arg_sec->dofs_size) { dtrace_dof_error(dof, "invalid args"); return (-1); } typeidx = probe->dofpr_nargv; - typestr = strtab + probe->dofpr_nargv; + if (typeidx >= str_sec->dofs_size) { + dtrace_dof_error(dof, "bad native argument type"); + return (-1); + } + typestr = strtab + typeidx; for (k = 0; k < probe->dofpr_nargc; k++) { if (typeidx >= str_sec->dofs_size) { dtrace_dof_error(dof, "bad " @@ -16391,9 +16402,14 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec) } typeidx = probe->dofpr_xargv; - typestr = strtab + probe->dofpr_xargv; + if (typeidx >= str_sec->dofs_size) { + dtrace_dof_error(dof, "bad native argument type"); + return (-1); + } + typestr = strtab + typeidx; for (k = 0; k < probe->dofpr_xargc; k++) { - if (arg[probe->dofpr_argidx + k] > probe->dofpr_nargc) { + if (arg[probe->dofpr_argidx + k] >= + probe->dofpr_nargc) { dtrace_dof_error(dof, "bad " "native argument index"); return (-1);