From nobody Mon Jul 27 19:14:59 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 4h87Zq2cJFz6nQKC for ; Mon, 27 Jul 2026 19:14:59 +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 4h87Zq1ZfRz3fMx for ; Mon, 27 Jul 2026 19:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785179699; 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=btPN1hzjQDM0xq35sPK3CELlej70yIe0uMSkLAb2/Ko=; b=xGn7Xp6G0CAfxYOUUWs0fd6gk8uMqbxW1lCzTuDAV5UZ7EwajG2KYN2imG82V9jK8La6/B b8AwiZd7x6G3XmIapmWWHYRWmuFV8D+ErmrKXBnu3TRER/sDiVUkXtv1lQ4BpCu8Ch4UTj 4abOPz28k2aneHdpKItztNQOPsR0DPVty9is5xZhqrxCT4P0T3klr/9M/AvlwZPWNhDxun ZSLcn4bNFpfw+BcZ+4x6hTbAYYax6PsGBambbmYXsnvEe3miKtNSxE1Io88JDWUjF7FlPE 0bSsHHSByHXD393bAdXgsIOGPeXAC8TAD0dzTcIgz44ulV9TqmsK77HAJb6bpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785179699; a=rsa-sha256; cv=none; b=H3M/Z3l4oZgb7pTMcL8LQJII4wI5UB75Uf887Vh2lt6mApCqZMu6r0F3DLdlMBsV2JHj4e 1b/TJCWOsoKigsaXoY7eK5zd3g4Tt2r1P31Dx1+2yhVyyYFVewXecYuBFdm8t66bKe7Dp9 pTl5Rnrir2rRzQS5lSWuCbu4StwugahngvYxJv3K04YMLPtOKy22lf6QngA5Udu1YyrQvp ftXXylUpimXo8bgKPqnUpfFgrWu+jr7iHnWRjbCh9D7w1ueXgNIkzex5Us2Gf5VOa5bbwY rwv3ooNstDej7TOLOnKpj6Eu1PXHiBrzFWjjwtSMWiGYCtMCLLHbU6xEL52BDw== 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=1785179699; 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=btPN1hzjQDM0xq35sPK3CELlej70yIe0uMSkLAb2/Ko=; b=C+KuTW3kqzWaBSKUjz6jJxtK0wKwqTkibMFSScttEc59RdfiRYW4xhLdjCVLfJ45LXOKDx hJs7y4vYzgydm+vfEMzGJPY/UUYSb5MINT9hfYHNErJ2cfjJRcjCNEoWI0pxw51HlBsT35 NSOPWzH5ngO9Oaecs40jy1wxfZR5f2kI/S9Junir5XHeXoXoBN16YZj9j3UOXnxuageTsW mS9C+b6Bg0pfx+NQA1J9fUKqnqNVtqhnu34oGRh7X5QcNg8LFwGlb80nba14KHZfhRmp5b sOT2htNJ4PNdA/N9nzUJDOIYHf8P1CcbDroqTIGs4/63wFRWCWPeAqFZmA3slA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h87Zq0Lxvz1LJ8 for ; Mon, 27 Jul 2026 19:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ebb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 19:14:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9ce4cdd7d2d3 - stable/15 - dtrace: Improve DOF string table 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/15 X-Git-Reftype: branch X-Git-Commit: 9ce4cdd7d2d3885a73e8940a1fd3913d493695dc Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 19:14:59 +0000 Message-Id: <6a67ae33.37ebb.332f745e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce4cdd7d2d3885a73e8940a1fd3913d493695dc commit 9ce4cdd7d2d3885a73e8940a1fd3913d493695dc Author: Mark Johnston AuthorDate: 2026-07-06 13:21:24 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 17:34:31 +0000 dtrace: Improve DOF string table validation The check for a nul terminator implicitly assumes that the section size is positive. Make the assumption explicit. Reviewed by: christos MFC after: 2 weeks Sponsored by: CHERI Research Centre Differential Revision: https://reviews.freebsd.org/D57977 (cherry picked from commit b56b601c5ba603031312b9bc7ae895ecb0dcdaec) --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index aa8716908cb1..ff31d806664b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -14288,8 +14288,9 @@ dtrace_dof_slurp(dof_hdr_t *dof, dtrace_vstate_t *vstate, cred_t *cr, return (-1); } - if (sec->dofs_type == DOF_SECT_STRTAB && *((char *)daddr + - sec->dofs_offset + sec->dofs_size - 1) != '\0') { + if (sec->dofs_type == DOF_SECT_STRTAB && (sec->dofs_size == 0 || + *((char *)daddr + sec->dofs_offset + sec->dofs_size - 1) != + '\0')) { dtrace_dof_error(dof, "non-terminating string table"); return (-1); }