LSv1.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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx7TG1nGzz46p9; Wed, 29 Oct 2025 00:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697874; 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=r+nEYTj6YWZ3G+Lid0NhjUeDWMu5OEjAjeDEEPXWKGU=; b=TNS2MpnHR5rJXHdV47JDIq3gLPY7t2khHn/8PpbvRs9E0aZ0nm9dAhFm9Lztiook7z14zX apQISUQ+eArR5jocAsATTFRWkTZ02UiQqPqalCtM6/G+qYiWqnmDPfUfEkHRxq0ClqnPoW DyuJEjBJ1jOyXGY1npsVR1NJvOfGU4aWa1I1hJPtY4TL9sVmJnwuRoA9SXNOShQxW0wMSv EiuAZ6rWO2cjxeMQN4Th6VnluGlDYkVjHO0VG7Np0fLu7GwEWsL3FksOo5+LMLFyH2ZR4/ HeoAg6+Q2Dna6MFn19dAutOEvZseGVqa16V+tkAycnJWYl6+bXCzN+80xscM7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697874; 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=r+nEYTj6YWZ3G+Lid0NhjUeDWMu5OEjAjeDEEPXWKGU=; b=RS3dNNklLU//jbun0dXkG2t6wJvqzxkX9v02VRPvBk7I1P18Qm5ENWQsy+UqVCCYgCQe0D aqBc8krWfLRzRHsbH8Aa+vE+EEwGp7usjky4nNQZeGpBnk1SfKSwcM8bJtlx7soBNjKe2h vx54GYHua1XhUAKyutMoHH2yvGeX5CwBqmq0UU1kGOE62SgJab8FaM2iFC50Y48h3x8H+5 HWKME516h2gNuxSxi7R3jZK5R5pdBMQYpoPGJJY1ysXO4LzAN/73O5x+qmcbAnpewRsDGO HxylfDghNM2nGPIZhFMygaMmrcHgZ3+m3pTZISWG/P+mkg4RuaB1UzmYgVtqFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761697874; a=rsa-sha256; cv=none; b=jHz9igFIp47pkplzKHcSRM2m9kXD36OBjbfYGIab5/4gnpjb37eZPtRIn42U7z3lXk6amC EnW/PxxHv6kVqeB5TQZQNln+6P5/YSnSPMF1zvpJifL86Kkndgr7eARF+43JZN3mkvFrzm S1UzsFGStmli0jWWn41p/PuziVJE7DwtOk3gEQ0aGv0w6YFlnD3g+AN6jHYA6GoD5GSiMN r01QaiXzMzR9h5Cf7fSG3saAbdsvcqYT+h3wS38UWEcli25SV3aJoVwNoUM4AH2tvBfsx5 9NN4UnLefS1FbYSdDy8cj9dvDo6se6iwNzDXStNvHQ3i3Vru4xueDpoBMzpxlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cx7TG1L2Tz1C6l; Wed, 29 Oct 2025 00:31:14 +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 59T0VEoX029475; Wed, 29 Oct 2025 00:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T0VE5B029472; Wed, 29 Oct 2025 00:31:14 GMT (envelope-from git) Date: Wed, 29 Oct 2025 00:31:14 GMT Message-Id: <202510290031.59T0VE5B029472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 73551cd6eac2 - main - nfs_commonsubs.c: Get rid of variable used as a constant 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73551cd6eac29a6707c802c7d7fafcb560bf5e2b Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=73551cd6eac29a6707c802c7d7fafcb560bf5e2b commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b Author: Rick Macklem AuthorDate: 2025-10-29 00:28:04 +0000 Commit: Rick Macklem CommitDate: 2025-10-29 00:28:04 +0000 nfs_commonsubs.c: Get rid of variable used as a constant The variable ncl_mbuf_mhlen is set to MHLEN and only used in one place. This patch simply deletes it and replaces it with MHLEN. This patch should not affect semantics. Spotted while fixing cases that could do large NFSM_DISSECT() sizes. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8e1a26eef354..f580a394a735 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -194,7 +194,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */ }; -static int ncl_mbuf_mhlen = MHLEN; struct nfsrv_lughash { struct mtx mtx; struct nfsuserhashhead lughead; @@ -770,7 +769,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how) nd->nd_dpos += siz; } else if (nd->nd_md->m_next == NULL) { return (retp); - } else if (siz > ncl_mbuf_mhlen) { + } else if (siz > MHLEN) { panic("nfs S too big"); } else { MGET(mp2, how, MT_DATA);