From nobody Mon Jul 27 22:32:40 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 4h8Cyw72Crz6lxv6 for ; Mon, 27 Jul 2026 22:32:40 +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 4h8Cyw3wjWz3CGv for ; Mon, 27 Jul 2026 22:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785191560; 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=Xk+21JXqZUwSz4Xsu2r/zNkhpsnkBXAqenenYvW4pv4=; b=Dgr3M2iOIfihN0HlPEJ1JiPBrtKeNDN6V34OvcLBp9zfw5kNCYkMCQqIOSedgGnzPKfgRx PewybrXbRFrJ9/nHnN1vYnoj9VFlsDSCarRfV+bMMeFxPb0aomjBcOrjHV8m0m051DsxKl 1W8fE28MwfA4UP1NXwD51eby54UCuWVGb8RnuJFT5nJRye1+bMw7p7gLKZI2ZsgfsLIkVA 7ongCYO5MMODIBPMemnpHIBYv6QekMMj6lp6X8ye0FfVwDjUtAdze7I5VsoeNSwVpJf+Lt riLAMbrwIQVvRwHrrFYMjeedGgo0/aqKHAHb0cNEoKIlqqkOwT8hXLjI9ze8DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785191560; a=rsa-sha256; cv=none; b=x2VEwpYTpxYE6DbHLssbRWMxpBhYsl+NMJg1GO7LWcuC1VA1XYIlksD1Nm4tJTzzezfCks vY5d+zyx9iHS+jEv3w8Pdu3YupJiluPL5JO2nT1V/pyiVfWA7oInfRwuc9G6Gn+ajLPmvd ZikyK1UH6XW4FK78lBYQ2HYV+d2rSjqpIdiGt3cxLmf6kXCmcCmE8+Tqhzt2tN24Ef1evY ZQV6zCGjTPUvzmfqobY8gG3q4q7UWHzPDHT+0k5rzJGBLUFOfUe4THsEb5tEu1QcdJScoa tRUnS3wUjEAyMRp1Eva61Ugo/kYSyUACw+uPCNeNKIfCP1Yu84e+ElV0zdO2eA== 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=1785191560; 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=Xk+21JXqZUwSz4Xsu2r/zNkhpsnkBXAqenenYvW4pv4=; b=MksHgW05AD+GzRCjNyYYB5F1uTChBS+HAT0JrD6P/pPHm6uyABrIgiUs3zmmDdpFAsDuQJ DX7kkAagOnOcsdB+T4Ww3NqykNGEh6b+yVK7ZtaL4TLQI4deUxLKmE+WqKT/CJXh6QApGx JyhRRLDwaNvR6wScjZGVhRIZbokhmgwNR8EjP7r9kYdsw3hnx7ZyqR3plpsCDFW3smuANN GFLfxAhT1sqf4btNISxq0cj9abtOMJGgYuXP1YvEjRhl4UvHzjnRKh1e42TJvmfSFi0b9M gL6PAE36wuLhL5adahl/fJF26edaWvpi+Bq8kzJT8KAlGIPXZdcA7f52XJu52A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Cyw2Q6nz1QPN for ; Mon, 27 Jul 2026 22:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26df1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 22:32:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3ee1bbd01eb3 - stable/14 - dtrace: Fix DOF section-specific validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 3ee1bbd01eb3708c8228f083d026d28ed0e07213 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 22:32:40 +0000 Message-Id: <6a67dc88.26df1.113b72e9@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3ee1bbd01eb3708c8228f083d026d28ed0e07213 commit 3ee1bbd01eb3708c8228f083d026d28ed0e07213 Author: Mark Johnston AuthorDate: 2026-07-06 13:21:43 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 14:05:07 +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);