From nobody Mon Jul 6 13:28:31 2026 X-Original-To: dev-commits-src-main@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 4gv4tl63qBz6jYJ3 for ; Mon, 06 Jul 2026 13:28:31 +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 4gv4tl1d4Wz3rcY for ; Mon, 06 Jul 2026 13:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783344511; 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=22Socabktks4m8ClkhPjxKEnmyRi+XMZxR3UyE7pJ4w=; b=yIOj6S16ULwbPAJjeEA1PPxDPA0HEbGKNAWCTOllu/D9C9YZ4voo3nm1PUWzN3RLI5cAgd B66dNwUxwiLpT9tIkmsT5flN4F+6PMK0Iy/67AwqmoQCkLqirdI7IdEppMCnw4hBFf5Gz8 rh/Sw4Vjy9/YqZYULcsmmEf8DeBTnDSCqxHQwgVGUSL+Q/1CXjP0ofP+l+G5RDoOUq20nj 2lzoqEtvtuPqMChbMR8WWZ+k862CHDBHa+8xhRxPaENFqHFDGaFnFoVYabPRbFHgV8z9oG h5j15ejjkuWrySRVwucIv0srcuDIKCk60lepGh4duqddRZpME/x0i7DgjU1M5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783344511; a=rsa-sha256; cv=none; b=l3MVu5IjHqHsj5GZLPzizYnhh4mcAv11/JrBd7K2JP1aNobkimX5VmLwXvTOamxQBmMwG2 rrPUwrn9Nnf09bpfnaQe45F+Q8zTvUC//HzOyzMCqqKAPSNSpwOW5PrTW7xi6ngfSGrOft 4GBCJkdOhLm+fL6/9Sup0DtQpBWG7Z21HXNfG4QTp0rrQIwMMXsgWWEyS3F9l3jpPN882x TDbijBKUDOGq6S7uhOI6+KcXNyYTk3Krhk1VdeqrcCXtV1+NxwiAekXqyF54enlkz81BuN KiEMsa+NwHBwi+oNcAD34KPeuXbYyyYTkMzCvu5Y5j6A8RA4fu2XevHPu2fdrg== 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=1783344511; 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=22Socabktks4m8ClkhPjxKEnmyRi+XMZxR3UyE7pJ4w=; b=u/+28mhFB97tiCuX8GZSvf4yi4OMiwp3DybKwH4HrXAHOQEw6bizOl2khR/8DiW9zSq1gm 30dVUU+dvWwASwsNwyZja8vMKhjhPhjKGCvUa087TuD1Xb6ivaiHO7gDvcCB3F5H8Z4U96 A/ZyMcKFrA3ObExNZvHDR0oQwhK22z5nYq5q8EjtMZmuRqY45xZoi6KMEkGqsGCstWfWyk 6hOMmcxgn631vCwcKkoLB90ma3p64qGQjqhJVlWZpe4Y7XVEAkPyHCQyYaSISR+Ap4DSPG tOqvCQWK6b4QJwPYbY8vn1RZg855jTUt0+BPBJx4aWZaZwMQw6qHMfLw85ihug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gv4tl0GfBz15c5 for ; Mon, 06 Jul 2026 13:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 13:28:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7f5fa76367d7 - main - dtrace: Fix DOF section-specific validation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7f5fa76367d78e47d483fdf2cc72e5823d0f7807 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 13:28:31 +0000 Message-Id: <6a4bad7f.3fc3e.5a6a8523@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f5fa76367d78e47d483fdf2cc72e5823d0f7807 commit 7f5fa76367d78e47d483fdf2cc72e5823d0f7807 Author: Mark Johnston AuthorDate: 2026-07-06 13:21:43 +0000 Commit: Mark Johnston CommitDate: 2026-07-06 13:21:43 +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 --- .../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);