From nobody Fri Apr 11 14:04:01 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 4ZYz1t2jkrz5s4Br; Fri, 11 Apr 2025 14:04:02 +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 4ZYz1t0Z0Yz43Qf; Fri, 11 Apr 2025 14:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380242; 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=vxhYP5SnBR+JvjV2TPvc8KScVY1bkvZ6Ry74e73pxQ4=; b=EFOmYBUtVSnY4cQYFXma2jtvFFxMGXzAk6R+3nOM/7SvPM2mwlljf/4qlQbqtPYMvuwSpq fDzJq3O8/5LAbaAZkCW70H0/ZqKiWNyk4WGmW10uATKbszVt06lVVkAFvEqrh6E9OOy94j FNIFj3M8Z9EWW+/H8BgqnoOJao54zPePCtC3sxhweOotcrVKRR1H8nM3p0if+871xh3C+8 LcEla8ePhlScEltG7nMDV+b9jWKExbGkwdl33SUYx8+20QHQrfPVhxJMuYe8Cd5gmtCHJc suhpIgTUsqzFIaHJIfTL4k7l84VKdRqXAjOGyMBCjt36sfTeUtOj+8JpykOPGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744380242; a=rsa-sha256; cv=none; b=KzGJLooShI7UHDjkFk7UV4CQemz0CWpL4Vuiq+rdb/eRO6vSkLgciAQu58EUDF29WJ5xH4 jwpXiwbXNC1AEs0gN7Pj0zO69G4ASDVv5m7+h6HDU+sFZgPn6fnaj1MDppDw4k9gdTW+/h V3QRV27bWCWsBSvP9jumaDy2CQNSr1/bE5MmWoqavRmthP2ANZ/5PRulxrE+fIqAS8I8u0 2kR+mjCXYmslBvv8DPuW7mwr5qg5fYivFTX2E5DU3WboQjwbplhEHjlDuya+sxoiPXG6gV TFxg0mMc712hgTEJ2cqQIsCF7Bb9vGDI8Drt+7wly5qRAw0tbg2fh9haT2SrFg== 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=1744380242; 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=vxhYP5SnBR+JvjV2TPvc8KScVY1bkvZ6Ry74e73pxQ4=; b=MQgSyy+RYmqIhKXvj/8k1YOulFAWMIUq8nUfVnJay9kOFdzC2uwkH3ZG9IQfJuuf8eQdJV y512qjW8XDDNGmEXNULe2eeTM1zRLPWh6eHVLnKdpt/t8a3Z/W4TMNSGK9xkfqYz8tqJ64 UU/AbsE0Eb62jlKxuqq3tYaIGyuohlVV331qIQNSTHIBj/HnZbAf4Czz5zXcCIJhMWI6tI AflxBRoAogx3cAhCi3o/9o6n2xgNW5qh7ys3JS5/cS2JxOsXKNS/7cs+AnF5wVjxXU9fue 5ojpPzQlyY9ewmqGV3jo1w1HE1GWxcUt654+p+rRmaF10szkfTqUBAtlxUHB7A== 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 4ZYz1t06fFzcLk; Fri, 11 Apr 2025 14:04:02 +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 53BE41do053764; Fri, 11 Apr 2025 14:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BE41ok053761; Fri, 11 Apr 2025 14:04:01 GMT (envelope-from git) Date: Fri, 11 Apr 2025 14:04:01 GMT Message-Id: <202504111404.53BE41ok053761@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: 4449cf28a315 - main - ctld: Require a mask if / is specified in an 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: 4449cf28a3152cf6e87a45176ae15ae250e543de Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4449cf28a3152cf6e87a45176ae15ae250e543de commit 4449cf28a3152cf6e87a45176ae15ae250e543de Author: John Baldwin AuthorDate: 2025-04-11 14:02:09 +0000 Commit: John Baldwin CommitDate: 2025-04-11 14:02:09 +0000 ctld: Require a mask if / is specified in an initiator portal If the / separator in a portal string is the last character in the string, treat the portal as invalid. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49648 --- usr.sbin/ctld/ctld.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/ctld/ctld.cc b/usr.sbin/ctld/ctld.cc index bc794815830c..ff23db6c5293 100644 --- a/usr.sbin/ctld/ctld.cc +++ b/usr.sbin/ctld/ctld.cc @@ -349,6 +349,8 @@ auth_portal_new(struct auth_group *ag, const char *portal) dm = 32; } if (mask != NULL) { + if (mask[0] == '\0') + goto error; m = strtol(mask, &tmp, 0); if (m < 0 || m > dm || tmp[0] != 0) goto error;