From nobody Tue Jan 27 18:44:31 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 4f0vTD5HY6z6QFys for ; Tue, 27 Jan 2026 18:44:32 +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 4f0vTC669Jz3rbP for ; Tue, 27 Jan 2026 18:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539471; 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=FalGnvjNLrpRSKXHbpmmYwWYUiS8K4b6vCp8rDhbnHI=; b=anEjbATdRkgzeuQg/1pzvsXyAAa9EhqxOX6t5BYcFUQkvnYkcEFm8dwbEkKuq1CHwiQN8c awh2ZR3b+3grFjOxNxeskNxxkq5fy4f9QNfwYwsN8TSe1lK8oh/YXaBUuH9CCfgPxpXxRn ZlKWr3PXa29LJ7ULhm67VFD3/6tIZcaxdsk4aHxePEcuxDC60VQ1hGEgVf8sf0W+94vPMj +D9GXEivdqRbJjw1jl3auvbiSeyijUZ9cnV2ifrC0Hl1whdGrgaJTA40IL9jG/0JXaK1wC H6cnMIZiqSbNaemKU7hXVXW7rY2FoSP/lvprO6QKzhOAG6CuDLcnnIQeACePWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539471; 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=FalGnvjNLrpRSKXHbpmmYwWYUiS8K4b6vCp8rDhbnHI=; b=lfkO3QDq5o17lTAYsi890+QAB1uOd2N0/Ihdu8lBhoXqYMttiKr196/IttWrzJ0HYdBGEG A3qwcPNqSsjbdrZCoOtu2/pVBQNNnlYUbXeEwN0EqVTIgWhQSPVmOccky1YkRePECmCpFZ ih2tDYMDxpdYk9mHnuKl1zVW0PamHQde/5VwTLHpgCtld55MS8VexuYgPpDTXl5ZlDve/E eDdoinQfu9vWAS62FIHl8j9fMzQYuoGubv7H45GAYMdVe2loYMYH0b0mt3bYqonLJqRYqC FLAJ7kXNbGfRkQvweXwg6p0Kmp3pGq1Q8RNnrT2iV0RiWclbr+EzVkaAmc7e3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539471; a=rsa-sha256; cv=none; b=p0nONITmdOzDxpGAw1J+jhcRl63Q9d5ZRxR3RsAT/NHHzDsruIalgkc+e82RLAB9HloWSO aOFQId0L0hRUZrFUa/FWJIVDluboxpnLhuA1wAXp2ve3BRsIP0BCKnpENFys2sdQdRIcNb 7Cq3R9CLGxq6IiT4P2mi4rKM4FOVWXZx2775i3sHpe5Cqc92BPGQSNqD0MdB4iR6RU2F5m ZYK1fXpUb3Y0t/B8nGJ1aVw733P5ysqnw8qDEEPKqNh85nK2irygtncaPaWITzMW+MkUpR u9hFxJ9gHhUR6StABOAMg7rtURUHga90HxCvB8TJaqOcyc73sowv7GdWFz8EMA== 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 4f0vTC5jZbz3dd for ; Tue, 27 Jan 2026 18:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f323 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 541c6c9d75c1 - stable/14 - ctld: Tighten parsing of IPv6 addresses for initiator-portal 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: 541c6c9d75c15d94e60e944ee9fe70de3e5d6811 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:44:31 +0000 Message-Id: <6979078f.f323.3f8ef623@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=541c6c9d75c15d94e60e944ee9fe70de3e5d6811 commit 541c6c9d75c15d94e60e944ee9fe70de3e5d6811 Author: John Baldwin AuthorDate: 2025-04-11 14:01:48 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:58 +0000 ctld: Tighten parsing of IPv6 addresses for initiator-portal If an address starts with a [ character, require that it ends with a ] character. Also, if an address starts with a [ character, assume it is an IPv6 address. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49647 (cherry picked from commit f3eb1514ce44aea5d288a74f34a0c6925ecd43ea) --- usr.sbin/ctld/ctld.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index 8a7a3c8b5a81..51983a42a8bf 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -320,14 +320,17 @@ auth_portal_new(struct auth_group *ag, const char *portal) ap->ap_initiator_portal = checked_strdup(portal); mask = str = checked_strdup(portal); net = strsep(&mask, "/"); - if (net[0] == '[') + if (net[0] == '[') { net++; - len = strlen(net); - if (len == 0) - goto error; - if (net[len - 1] == ']') + len = strlen(net); + if (len < 2) + goto error; + if (net[len - 1] != ']') + goto error; net[len - 1] = 0; - if (strchr(net, ':') != NULL) { + } else if (net[0] == '\0') + goto error; + if (str[0] == '[' || strchr(net, ':') != NULL) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&ap->ap_sa;