From nobody Thu Apr 14 19:02:53 2022 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 D06E21B52F28; Thu, 14 Apr 2022 19:02:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KfTP95Vkzz4cfD; Thu, 14 Apr 2022 19:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649962973; 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=wdVX+K+UO+0PlBmD4wpiKFJ1K6tJN0cwdLhSBxGb5KU=; b=V3eWZjjguZVNtK4KrAw86LHpCDx/AT/noAqC/j3PpGB81vdZEpDBT6RL+7INVjA1WRd5Jv cXnWM0NFdKV/pNGynVwFByODyO5/+kqT7qYO4b0hyOlPCc/lDOhzvLVweCRleR6b8qT0mq lld4bqtBRaVFRhx/2civxf8NVRa0qerKkbG7OgtinbGs7wa2IcP7A0+s2FHQZugpOVGkwy qZQJKBpvrtKyIpU516jifCCqirWPRCJAxUaYucOc8AHj9iNjHoRZvJcMeQqjYau+0EGYS2 rbVOpyoTThAOglM+HHF+wLNaIMyEPMm4vc50yCRnm6QVQC2AkHXoADbN9ia+dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CCC4264A0; Thu, 14 Apr 2022 19:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23EJ2rAB099861; Thu, 14 Apr 2022 19:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23EJ2ru7099860; Thu, 14 Apr 2022 19:02:53 GMT (envelope-from git) Date: Thu, 14 Apr 2022 19:02:53 GMT Message-Id: <202204141902.23EJ2ru7099860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8b01c3026b78 - stable/13 - libctf: Fix recursive descent into anonymous SOU fields 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 8b01c3026b78152d9e0ca6f3758ea226f32e48b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649962973; 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=wdVX+K+UO+0PlBmD4wpiKFJ1K6tJN0cwdLhSBxGb5KU=; b=XpGg8mjXp/pLDRmosptXcZ1iH/kj+fBDdsKXpQSQPoJBABtWpUkEmhgZ0rnPWOMhLxbVKY kUkrv1TVKfagHb2mPMVvLuzApNaUAVrqH1ISUWoX1wBBU+w9VrQT0eLo81HsXvvWTsGDvk 8Y72dlDlXrkTCZ9autKaj2CX3NpxUyR9q1WC8c9JbLSA4uGiEIwZkGavffXJvAQj5cuIww eHJTW9eEhHBDTRDWTkhYHkva7WGh7VYq1KCYLPV3xWVENOZroBIFL67Gqi3eA0/rQUixCr gOSnl7+prQLqeIuGDu9Np73RK84pfbpX1KxpMBNXqkxDv1kCNikBmC5/+QNkuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649962973; a=rsa-sha256; cv=none; b=S3RCI33r6GjJ/f5CO7HoQBafgQW4jH9IABe50CKkz1Q/4WVMcA4me5vJ72Ulfo7O0vcHsU O6F1VU4aygG2dcIAYK/gA8LwLGh15G3I2+5A2A1Vv0VLt4egwHpSWPovGXga//4WFvBjzW TvJ1VIanaT1IWuGlLwr1cpK710zoYs1Ihsiuqt8jy/fH4/qwdcvhU4z9ny6R4R/SmCMNZr t4NP4HFaFkJUa8WML+/OLfWCxFjkgEapIsfp8uPOg2w7UN2P2T9OOQgdJ7E5tBgDOm2EuE XduLyTG8NAi8GUXlEvAMEePVG/im4smyvyRjlHGdtSVb92XfYDZGFa+XG9/EEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b01c3026b78152d9e0ca6f3758ea226f32e48b9 commit 8b01c3026b78152d9e0ca6f3758ea226f32e48b9 Author: Mark Johnston AuthorDate: 2022-04-12 19:24:40 +0000 Commit: Mark Johnston CommitDate: 2022-04-14 19:02:44 +0000 libctf: Fix recursive descent into anonymous SOU fields PR: 262412 Tested by: dhw, gallatin Fixes: a6fb86917362 ("libctf: Handle CTFv3 containers") Sponsored by: The FreeBSD Foundation (cherry picked from commit 6e563a1b608438504d963c2d7c70e50d2e75af46) --- cddl/contrib/opensolaris/common/ctf/ctf_types.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_types.c b/cddl/contrib/opensolaris/common/ctf/ctf_types.c index de8269659c29..a3fe0bba4a9d 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_types.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_types.c @@ -818,8 +818,8 @@ _ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, ulong_t off, ctf_get_ctm_info(fp, mp, size, &increment, &type, &offset, &name1); - if (name1 == NULL && - _ctf_member_info(fp, type, name1, offset + off, mip) == 0) + if (name1[0] == '\0' && + _ctf_member_info(fp, type, name, offset + off, mip) == 0) return (0); if (strcmp(name1, name) == 0) { mip->ctm_type = type;