From nobody Thu Jul 25 19:33:30 2024 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 4WVLf31ZR1z5R8Vs; Thu, 25 Jul 2024 19:33:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVLf25mDgz40ry; Thu, 25 Jul 2024 19:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721936010; 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=MmIf+D3FnWY347sjYgynq441Mly6pq7jNNerdUazQYk=; b=XG5uyGWpKzQgBihUOeAXUkNx8htHBnP1eWhDsIHxZHAVjPfdvKjcZyyKQVvJIa6VsPChHa SPbZHOq3RBcJ9iolC2sKcROhdaH0vZVyzg6oQkCWRE8bAb8dTb1crJ4oddfc6iUmhbC+fm tww56Md0xfJDoZueq8r3dU17P9bH77VEqkBpJhBBdoxFsvH3HXwvVQzuExaT0n0Ta5EMKg HZQ8NxdwYw6h98jPuac44dTPNBSkDDXk+Lxo67dmzEtEWESlbFVnLpWmdN6jsD2cPrNBUC Xuixw1sEiPf1R422MsPTmsn+5UU1Kw/SH/xcl8KxUJvIiXrPK4BGPKM1jsppDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721936010; a=rsa-sha256; cv=none; b=m/pflAxbJE1p2o8kIJhAdoXmAH6xTQ3tCtb63JorUBSzlZ0mHraeUpdr77AanUDDx54gak MveZPkSPQSDXD448820ioVvZLTl1CWPTrPeTAZA1BiqnhvJGIHNMAVRsg3PdnyoqontHsV J7I1gxf4/XQEXlqPT2GcETOJACd2e+/cpt+UVWXMIz0abXk8y1tiGxK4d7UUHOQboK7LyU aQg+8xKfJrTvoSGJ03tn3GcFBqDR24szURZ1llGWOCQ5pEx2KLo4JNpDaxyx2GiN+2UxPM 1yyDs1kG1zrkTok+F5I0HOZcKDn3pxr0nlsHwWpz2a/cUU8SIWBksspmvcOMFg== 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=1721936010; 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=MmIf+D3FnWY347sjYgynq441Mly6pq7jNNerdUazQYk=; b=AGpDeuGFoUHWNl/AvSlyPpTTcuRy9vcBDp87QsoEmnsXai7AJOBEnyyHSntpb/KcKCzFUV u70ZE/d7p+hcSW1oWEcFZ96m7zB20przWReFpYNgik5+u7KLci8HyX9MeLUaDmwNnIs/7A dgB8sz3bkskhl1U+IuBEVNojwLNGaGBS9L3BvyE9TnihilHcYfsjMt9NBTV5yWgsqR1lNm LDSzEG67OYiIl1LjHci4kug7VXZpNUZF+9V64GBBXJtHcWSErbcqYak49S3TPF0x52nx9N XiuN3AXKRPUFNz5wkisTp9TL9BmrsHprNGgX1L5/JG2SrERoMYRx0XQQuUM9mw== 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 4WVLf25Dl1z17Vq; Thu, 25 Jul 2024 19:33:30 +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 46PJXUeZ042750; Thu, 25 Jul 2024 19:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PJXU2u042747; Thu, 25 Jul 2024 19:33:30 GMT (envelope-from git) Date: Thu, 25 Jul 2024 19:33:30 GMT Message-Id: <202407251933.46PJXU2u042747@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: 846d702f234b - main - libnvmf: Reject invalid values of MAXH2CDATA for new associations 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: 846d702f234b80881dc6641057b623308917b66a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=846d702f234b80881dc6641057b623308917b66a commit 846d702f234b80881dc6641057b623308917b66a Author: John Baldwin AuthorDate: 2024-07-25 19:32:42 +0000 Commit: John Baldwin CommitDate: 2024-07-25 19:32:42 +0000 libnvmf: Reject invalid values of MAXH2CDATA for new associations Sponsored by: Chelsio Communications --- lib/libnvmf/nvmf_tcp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libnvmf/nvmf_tcp.c b/lib/libnvmf/nvmf_tcp.c index 89fc65bf6c43..93948b9b5fd0 100644 --- a/lib/libnvmf/nvmf_tcp.c +++ b/lib/libnvmf/nvmf_tcp.c @@ -924,11 +924,18 @@ nvmf_tcp_read_ic_resp(struct nvmf_association *na, struct nvmf_tcp_qpair *qp, } static struct nvmf_association * -tcp_allocate_association(bool controller __unused, - const struct nvmf_association_params *params __unused) +tcp_allocate_association(bool controller, + const struct nvmf_association_params *params) { struct nvmf_tcp_association *ta; + if (controller) { + /* 7.4.10.3 */ + if (params->tcp.maxh2cdata < 4096 || + params->tcp.maxh2cdata % 4 != 0) + return (NULL); + } + ta = calloc(1, sizeof(*ta)); return (&ta->na);