From nobody Mon Jul 27 22:32:39 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 4h8Cyv6D3jz6ly7t for ; Mon, 27 Jul 2026 22:32:39 +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 4h8Cyv2zxsz3CJv for ; Mon, 27 Jul 2026 22:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785191559; 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=mM0WGuf/mOmSFB3RmQ3bm4xq4s/ciQIQoQhtdmzvgTg=; b=kAtU1mcRzNB4KyWpjO7I4CrqX5lye7ffnT8tiOYUuJX16wjLRrMAAD7OtSBL1CNtREwk5/ STdhmVvA1XkjSz3zDc9WQRhzs2IxzvsO3Z9Zjp7Sl5/PatWgxTGdCj/wAnGVqBe3rfd8+Y fwBKEIYQeAv0t8XVP8OdqOsHAYG3aeFUDqg6LE9l0rffPZ6vrLn52IBElFYCMf0ho6R8m2 ae+duwOweTmUMceYvpD8scz/+nVLd+EeCWgFtNHNyLfEyZrBg38ay0AtMdGLpluWYeIueE gRthZyZ0IuHt7GZNJJebtA2yq6GAAPTa/fdmHjLDCzntyGRD0H7jQ2lL8d1Wmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785191559; a=rsa-sha256; cv=none; b=XbxZp8RGhEmd+ud3YH1TvGAAwD5GCLvV6j90yTWuRQ74gtv53c/h0FgOOw/fGTg4N0umxw YHaQpPXgS7jepL4JfycGzwOnJCVwC/5o2vRZsZ/o7M6JIvignXBAh32NMoLfXyyKplS4Sc tlJwPnNVy7X3mGEG+KOLOcCTvnrGffxpg0bZkjbYm28LottYjIVTeO9oReA4atEV+3I+9F bgpiUYqREl+FLf1+FVXfC5QGsgeXNKeTFwBh8UxSYzYjlwUc6jAsuutyjEIl6DwzTg1jim uv7qzmHIY4CvQAcMGJ+SOcaKNki5IN+1Z2JjsgB72FsWgjQB1Ttt8TFrauoSrw== 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=1785191559; 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=mM0WGuf/mOmSFB3RmQ3bm4xq4s/ciQIQoQhtdmzvgTg=; b=ciEM7BViSL/Qyzt/aw1PJOd7bKG96SohwCWaFuO6xlB3cKqOAmjjViThuWANes14hx1BU5 4lc5yhT2wSZkP6RsvULf7qm2sHIGfehG8SFwn6C7KfbxkV2y2zi1lItFsL1yY736WlEbKZ 9ctXdDzgz+cmvsUJiXOs3Oci2m+Bxq67ZShVtsyNFAjG38sLvmKuigROLqbv9F3dVrg9Cz OXrMn1gE9F3iVzph+AO8ncobxHMf7oQH+h7IVWAhfUwj8/GRwq3UnNt/tXcFHcJCVO2Xsq LOYzcpAVtbz9hdpWUxCR472cc/22PjDwI8hpkROPD08cvPOqxXocgefT59rVvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Cyv1mdGz1RKt for ; Mon, 27 Jul 2026 22:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26655 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 22:32:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4d30095e2849 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4d30095e28496445761dd65e0b7c37731a61ce25 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 22:32:39 +0000 Message-Id: <6a67dc87.26655.aed2cee@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d30095e28496445761dd65e0b7c37731a61ce25 commit 4d30095e28496445761dd65e0b7c37731a61ce25 Author: Mark Johnston AuthorDate: 2026-07-06 13:21:24 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 14:05:07 +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); }