From nobody Mon Jul 28 18:33:39 2025 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 4brRv75MM2z63M2D; Mon, 28 Jul 2025 18:33:39 +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 4brRv74cYsz3rXg; Mon, 28 Jul 2025 18:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753727619; 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=/mp/w1GTgFDaK/ckcg4Mt0lIhrf7AWb1BlBi2w4ZBnA=; b=OQgP6a019Rx8X3pgDgSkAnEF46ErH8pFbFj7Oz5srvwBv9PQMqoDnvmw9TE3W19MZurCKP YRnnEX+eTqS8Ugnpuk2dUEj01lR6I5SsX/sAHwAt6ITi3Vbj6argNfGRe1Y+R6RkuOoCF4 gLGYoqIbsInD2NeqDInlGkGglvuL11DeiXv8GTcnLpFLT9CGtakB+fcbSoLY1ym7w9OYcT WKqE+OJ6uxo4ZBImuCbFC2CdNizgbDEjiNK+kxIcphe1QG8wmodpqd5lE34T0cll+YPPJC oSK1FnuMFJxsuJb1wmyfR/k8dNURPyXxLWu30/KmjOYh4DpMQlKdLQRutwjCaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753727619; 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=/mp/w1GTgFDaK/ckcg4Mt0lIhrf7AWb1BlBi2w4ZBnA=; b=DawW11zz2oWqDGvTry68DPK45nAYbBH8dA/3Y/U9ujVzJXn0Qwp+sMCQTRLoDlR0wEZQsz vscbtTo1UfJZHw7RBmVbwu6a7vzHX7dH6cEIvxzJHe4p9YVEq1xVl4EuXB9wxZ2VEjJfXY BvPpfGQbcQJz06sOQCg0MHTsNZadio3QBEnJGBbGV/5wbpz51ZBkbnSzD9iKOCSFsciONV OR51Z6u1x+sZBdYI4Bjvab5e+eH8345zeg8f3H3AQEfTJDZXbJtP14emcVIYYUcp4RCdr7 UE5QTyEt99iX5jtebLDldJfH/6ohwOIfoOc1HHzV2MZ4hDDUz31Y4TfyyI5X1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753727619; a=rsa-sha256; cv=none; b=Nuf18aUa0PN2rkGxF9h+XQ3UkFsCMDC889laQ1EYwg58e089YR4eVVtHwYuhg1Gbu1Hy6j 3ezMX7w3mBLFWdw+apvfXnruyYJ/KDA5lDOt4TRjc5W+PjPgJGrW6T22CCi83LKddF4GAH BHpOPujnK0+PGf5DhE/fH28xS0f25qYI0ri/kZ+Fd7GGw9yTzjh+9131bMiTt3I2oh3rM/ TjtnNjEm/RxY16P44vVCC+0ra752PnWUgtr9IywtAZ9+kLgieYeTM9DSkniT+Xx71hUhyK 8ue9v8Idquogr8THgAm0PujlK5bdxbU/FeJltLkDa0Ae27EFfYujidDt65kHNQ== 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 4brRv74BMrzxG1; Mon, 28 Jul 2025 18:33:39 +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 56SIXdUJ054191; Mon, 28 Jul 2025 18:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SIXdVe054188; Mon, 28 Jul 2025 18:33:39 GMT (envelope-from git) Date: Mon, 28 Jul 2025 18:33:39 GMT Message-Id: <202507281833.56SIXdVe054188@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: 9f0f30bc1f5f - main - libnvmf: Add nvmf_nqn_valid_strict() function 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/main X-Git-Reftype: branch X-Git-Commit: 9f0f30bc1f5f08d25243952bad3fdc6e13a75c2a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9f0f30bc1f5f08d25243952bad3fdc6e13a75c2a commit 9f0f30bc1f5f08d25243952bad3fdc6e13a75c2a Author: John Baldwin AuthorDate: 2025-07-28 18:33:03 +0000 Commit: John Baldwin CommitDate: 2025-07-28 18:33:03 +0000 libnvmf: Add nvmf_nqn_valid_strict() function This moves the checks previously under #ifdef STRICT in nvmf_nqn_valid() into a separate helper for userland. This requires that the NQN starts with "nqn.YYYY-MM." followed by at least one additional character. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D48767 --- lib/libnvmf/libnvmf.h | 7 ++++- lib/libnvmf/nvmf_controller.c | 50 ++++++++++++++++++++++++++++++++++++ sys/dev/nvmf/controller/nvmft_subr.c | 40 ----------------------------- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/lib/libnvmf/libnvmf.h b/lib/libnvmf/libnvmf.h index 7cdd7e433455..6b38fd286596 100644 --- a/lib/libnvmf/libnvmf.h +++ b/lib/libnvmf/libnvmf.h @@ -111,8 +111,13 @@ const void *nvmf_capsule_cqe(const struct nvmf_capsule *nc); /* Return a string name for a transport type. */ const char *nvmf_transport_type(uint8_t trtype); -/* Validate a NVMe Qualified Name. */ +/* + * Validate a NVMe Qualified Name. The second version enforces + * stricter checks inline with the specification. The first version + * enforces more minimal checks. + */ bool nvmf_nqn_valid(const char *nqn); +bool nvmf_nqn_valid_strict(const char *nqn); /* Controller-specific APIs. */ diff --git a/lib/libnvmf/nvmf_controller.c b/lib/libnvmf/nvmf_controller.c index 971dccbe039e..f26f11633e03 100644 --- a/lib/libnvmf/nvmf_controller.c +++ b/lib/libnvmf/nvmf_controller.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -15,6 +16,55 @@ #include "internal.h" #include "nvmft_subr.h" +bool +nvmf_nqn_valid_strict(const char *nqn) +{ + size_t len; + + if (!nvmf_nqn_valid(nqn)) + return (false); + + /* + * Stricter checks from the spec. Linux does not seem to + * require these. + */ + len = strlen(nqn); + + /* + * NVMF_NQN_MIN_LEN does not include '.' and require at least + * one character of a domain name. + */ + if (len < NVMF_NQN_MIN_LEN + 2) + return (false); + if (memcmp("nqn.", nqn, strlen("nqn.")) != 0) + return (false); + nqn += strlen("nqn."); + + /* Next 4 digits must be a year. */ + for (u_int i = 0; i < 4; i++) { + if (!isdigit(nqn[i])) + return (false); + } + nqn += 4; + + /* '-' between year and month. */ + if (nqn[0] != '-') + return (false); + nqn++; + + /* 2 digit month. */ + for (u_int i = 0; i < 2; i++) { + if (!isdigit(nqn[i])) + return (false); + } + nqn += 2; + + /* '.' between month and reverse domain name. */ + if (nqn[0] != '.') + return (false); + return (true); +} + void nvmf_init_cqe(void *cqe, const struct nvmf_capsule *nc, uint16_t status) { diff --git a/sys/dev/nvmf/controller/nvmft_subr.c b/sys/dev/nvmf/controller/nvmft_subr.c index bb2bc0988e81..245971813854 100644 --- a/sys/dev/nvmf/controller/nvmft_subr.c +++ b/sys/dev/nvmf/controller/nvmft_subr.c @@ -26,46 +26,6 @@ nvmf_nqn_valid(const char *nqn) len = strnlen(nqn, NVME_NQN_FIELD_SIZE); if (len == 0 || len > NVMF_NQN_MAX_LEN) return (false); - -#ifdef STRICT_CHECKS - /* - * Stricter checks from the spec. Linux does not seem to - * require these. - */ - - /* - * NVMF_NQN_MIN_LEN does not include '.', and require at least - * one character of a domain name. - */ - if (len < NVMF_NQN_MIN_LEN + 2) - return (false); - if (memcmp("nqn.", nqn, strlen("nqn.")) != 0) - return (false); - nqn += strlen("nqn."); - - /* Next 4 digits must be a year. */ - for (u_int i = 0; i < 4; i++) { - if (!isdigit(nqn[i])) - return (false); - } - nqn += 4; - - /* '-' between year and month. */ - if (nqn[0] != '-') - return (false); - nqn++; - - /* 2 digit month. */ - for (u_int i = 0; i < 2; i++) { - if (!isdigit(nqn[i])) - return (false); - } - nqn += 2; - - /* '.' between month and reverse domain name. */ - if (nqn[0] != '.') - return (false); -#endif return (true); }