From nobody Fri Apr 11 14:04:00 2025 X-Original-To: dev-commits-src-main@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 4ZYz1s1hHfz5s41X; Fri, 11 Apr 2025 14:04:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYz1r6nYlz43W4; Fri, 11 Apr 2025 14:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380240; 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=y7Pri9NiFmmSw25xzAUKlRHmqtUW1CxJe8U92bef/Kg=; b=kMZPQEx6mXFoHXG9FzSSyMK39wE0zDVFHurUy4TXdra1cCu4ocKZCS35nQli1aC1utsF5f 5SXKgfP715MbJ9g4bRO0z4miBMyqLejCqZteBMMh94gPYaazJaEvfjGiuM0mvN2HsCvJSG JozAKlWqkG4sOYy0ALUynb9S6Byfe5bYjZ+PDog4r/lOVoAxDge2GdSSn/DFBKNK4c4Krh DLksbprKp5NysrI2NYTl32q2fbu+yHLsCYP81BCqjJn33ZiDfy7i2GDMO0Old74HVwy2xk H+6qaqB8sWVVUTgKBvkyNOI2YWrJiJS9vGAcYhkpB4DaoC3IrgX9nNBIWAKo9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744380241; a=rsa-sha256; cv=none; b=uuI8BJ4n5dahNvdrLb1W0lWpJOftfRkFozzGwuk6shb6jLjZVMRzMu0vW57HGh/lkdauqs QGLmcjBQvEHkGETFwA/Dgoc9j3c88Cb57tMx8+xr5kZ+jpVSh9jypSMZpqUmE+Z66AKl1V XU+pHssYMLKydRS5DbVLhaJ0dlg58SkAFkC2xJdbK+115KKRVo1FFR6PvQdD4bQcaDHAFe 1iJEBanaa6A0JKKxFMfixVp1AcHXB9YO26b/F68hJ6PWMRlOSGDt38UMx7wSTfCqWkxAl7 R7GBfp/Ea8BN9LEx/9qgyCwO6EhqabLmPZx2cxePQZPe63IvjGCsZudWDBbyuQ== 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=1744380241; 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=y7Pri9NiFmmSw25xzAUKlRHmqtUW1CxJe8U92bef/Kg=; b=eiL9X92bj0chdEdI5qOIw32CASutQRB+U+XtccXyZqZazFH+10Bcn8mEi7yRS4RlnPaq1R oC6LjVNhhzGzzjdZ9RyojJhanavycNGKZcr2SZ3ocJ0JfEi27g1r3dTx7ia9MC1HYs1tQQ JSXXGNYUpRHopH7vY17fuKd994ZQT+UuIXWQzxyxwcCHjLj0W7ogzW9vwMCGagB1v8i4Dm 5Xj26UxhSN81UeGoRtQEEbzN2u48LCfIxzK6wb5d53bqtCr7PIjUWPqnT+AXTf40dZCyGI yWCNoCC7k61Xm4ipUf+Oe/PLeh3eJu2iZw8CLDJzZUs7b8yIEYIbqIL2NlzYfw== 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 4ZYz1r6JpDzbl0; Fri, 11 Apr 2025 14:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53BE40Zk053725; Fri, 11 Apr 2025 14:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BE40mi053722; Fri, 11 Apr 2025 14:04:00 GMT (envelope-from git) Date: Fri, 11 Apr 2025 14:04:00 GMT Message-Id: <202504111404.53BE40mi053722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f3eb1514ce44 - main - ctld: Tighten parsing of IPv6 addresses for initiator-portal List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f3eb1514ce44aea5d288a74f34a0c6925ecd43ea Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f3eb1514ce44aea5d288a74f34a0c6925ecd43ea commit f3eb1514ce44aea5d288a74f34a0c6925ecd43ea Author: John Baldwin AuthorDate: 2025-04-11 14:01:48 +0000 Commit: John Baldwin CommitDate: 2025-04-11 14:01:48 +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 --- 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 08ac91a75c21..bc794815830c 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -319,14 +319,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;