From nobody Tue Jan 27 18:44:29 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 4f0vTB0pXXz6QFyl for ; Tue, 27 Jan 2026 18:44:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0vT94dD2z3rgX for ; Tue, 27 Jan 2026 18:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539469; 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=sQcs7FFgh4wRqJT1ps/z9KHihAr0tgWOycS9+beAO5U=; b=YybH+LDkey4kvquoVHk8kvxbCWTZ424DCCAH4aD4yXxebrQ8TtoP0PqdrJ7x84GLqbo5bA QnqXC226xsiX+PQr1fBAa8Bnn2iZHpUo9nJjPBTQm120r7a1YrDCV9tYjtLU6YFCM7od+H z9HFWfCgplc6S+EuO3gZ8hLD7EOmVhMdOFyvtzvkyccw51vKgPIc1EVfkvyEdCEO9Y/Vol cYY4YdvtgvZjbKJuOBe2010xlGZ083Q4f+MmVnBcqXh7RlfZuDy6mMxuxbl7cxHkxdNdUw jLcvCwFBgL89cZw6PM5CpvQ7c2WP6FRpis36ojtphsrUI/rQWX2mMElLCpFt4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539469; 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=sQcs7FFgh4wRqJT1ps/z9KHihAr0tgWOycS9+beAO5U=; b=MR3yIpmAFCAOjaD6Y2rGChdFMoyJaypdQDthg4OFuZepzpd8pI3sStV/Z1kCakFYnGPLEN dS2TQ29npF35nX+VRJBMXDOBOdV/ZirNEIwwQ8WZ3joaK3fXvmCnIWITnOToe+3x+atd1J +r2gCYAU4mFOHlsPKk/F9X8wBmfOwWsAjQCBIp9mKMFFfPHvhb5qaviR470wiv1I5ZORxn cUYf7AukXj4FTWv3Lk/iKsR6krSdfgGFlm+G0U2lZC465x+JwctFcSjdguBmNWjo4xuQru cqv1OqKGKUHu2A1KEjZyDXr3remTDgZSr2fEr919l6UrknkdJyEuzAoibVsu8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539469; a=rsa-sha256; cv=none; b=Dalq5GOGJtb5rpgvjIBCBVfzGIR1uJhvrmXrd6YLEZpkIiI8Qzq3LgVVxOUbyB4xsJqBW6 S4thXzQ0hUWw/xuAe1jGeB6SlVkrQXKYeQVrvtch2rvvdooSdQ9TsRN6Yd7q65fFV20Hua tAlrcSco2atJBszfDeOvoxSx7aH0ln8l9ZLb11Kbi8puPw4ouCZSmQZmRKsIxHkRSpAh3S fc/6Uu7eS33Mfh7EB5Md6byYCiWgCzVnhUjFbEK2pTwpisji1anVrws6rR9aUXdo7LGLlF Fq6o3AlI0RQ0LWHp1iFkbzm/R+jT/GOVqBleDqdHN+h8Nw1M/Ll+SPeRLhRV+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0vT947mZz3YZ for ; Tue, 27 Jan 2026 18:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21200 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 88b3dab8d0ec - stable/14 - ctld: Properly validate mutual user/secret for CHAP-MUTUAL in the UCL parser 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88b3dab8d0ec099ac47d5314c2244ae283623143 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:29 +0000 Message-Id: <6979078d.21200.171138b3@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=88b3dab8d0ec099ac47d5314c2244ae283623143 commit 88b3dab8d0ec099ac47d5314c2244ae283623143 Author: John Baldwin AuthorDate: 2025-04-11 14:01:06 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Properly validate mutual user/secret for CHAP-MUTUAL in the UCL parser The code was checking the non-mutual UCL objects twice instead. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49645 (cherry picked from commit bf41156712929460aaf968e9d38ddc3847f90f6a) --- usr.sbin/ctld/uclparse.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ctld/uclparse.cc b/usr.sbin/ctld/uclparse.cc index ccb0b45a5ab1..1eb9f7736e4b 100644 --- a/usr.sbin/ctld/uclparse.cc +++ b/usr.sbin/ctld/uclparse.cc @@ -100,14 +100,14 @@ uclparse_chap_mutual(const char *ag_name, const ucl_object_t *obj) } mutual_user = ucl_object_find_key(obj, "mutual-user"); - if (!user || user->type != UCL_STRING) { + if (!mutual_user || mutual_user->type != UCL_STRING) { log_warnx("chap-mutual section in auth-group \"%s\" is missing " "\"mutual-user\" string key", ag_name); return (false); } mutual_secret = ucl_object_find_key(obj, "mutual-secret"); - if (!secret || secret->type != UCL_STRING) { + if (!mutual_secret || mutual_secret->type != UCL_STRING) { log_warnx("chap-mutual section in auth-group \"%s\" is missing " "\"mutual-secret\" string key", ag_name); return (false); @@ -165,14 +165,14 @@ uclparse_target_chap_mutual(const char *t_name, const ucl_object_t *obj) } mutual_user = ucl_object_find_key(obj, "mutual-user"); - if (!user || user->type != UCL_STRING) { + if (!mutual_user || mutual_user->type != UCL_STRING) { log_warnx("chap-mutual section in target \"%s\" is missing " "\"mutual-user\" string key", t_name); return (false); } mutual_secret = ucl_object_find_key(obj, "mutual-secret"); - if (!secret || secret->type != UCL_STRING) { + if (!mutual_secret || mutual_secret->type != UCL_STRING) { log_warnx("chap-mutual section in target \"%s\" is missing " "\"mutual-secret\" string key", t_name); return (false);