From nobody Thu Oct 30 01:05:25 2025 X-Original-To: dev-commits-src-branches@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 4cxmBG0v5Sz6DPPR; Thu, 30 Oct 2025 01:05:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxmBF66rcz3dGx; Thu, 30 Oct 2025 01:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786325; 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=zDGBKobAcNXRzdeKW93JTitY3BqmkVkwTmrI/OqzCgA=; b=roEvu6nEF6DVTHFzs+1BcXV3U8EF9qzymzOVhHKz71aKIm3YGzKd0V5su4FlQ4dBIF2Cqz hugJYB8IDUnVsdB6xMVNGCy+jzIQTx5hQEp7EM7uRF64rcUXykJ3q3brEXtF6EbgynNVH+ TU1krsepvzO0j3mZlhNAdXOOTpDAyJKUFCCUpzU/CG9n6HtFSaaEXP0ssIJH/jqrGx0sDF aG1lTQyW26sYCISfOA6NXNNORmFUShl70tFsrVKck59Hme1t75OTQazL/Bb+5AXutQj5cP /vfUnFrPX/ruclVsIfr1db7mfjOA/9OVJPWAfCyx8Hs4znNGDar8PJC4xnt6Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786325; 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=zDGBKobAcNXRzdeKW93JTitY3BqmkVkwTmrI/OqzCgA=; b=haZ2t0PyhQDd0gFGKaSqXEgzJune1pJeSxGsa1DgTmHJn/JJJBl6dkiUZ7biOR9zrDWklh qhUVQ0bm/hbCm9Wx1NfQcQk7YhMBYHtgFPm4W+NoK4pneOGDPloCCVQkfYgxoC9IyOF9aO 70TtTu4PZAaiCjmzlBDRBPF4kA/64gpwF2fkK8SD1o90IjPwvL++C/G933KGDCrFMKpTfG yYOb2S3cqCwqhtyXwvvd3UkdmKpyYyWnWwM1mYY1KTxYayGfI+63r8yN4dVM17h5lB3duc MU64IM2E6WwdLU/6ZrMJlVlxkwr/ot2KCs5UT4joj0i21gIZysX6a+nw8A2SVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761786325; a=rsa-sha256; cv=none; b=urvO/4RbBlCDTtyRQwqV3v/6yJjbyIomFokY2Rf1w8Kj3BQWKY+Ow7U7y9OYiHbqpUAuMn 92dBpA3o5klEVPZWDNYfQKdEKiA0/aLEJlUmg8dACB6MVYxuSEYFx1Mpa/gcuKs97ELENh doozu57dBXV7wxjCVd6xAophfGjvblmrjFy8xJoiz3P4o2f5X40jJwuQsCOb8AA7v+BtAr 3YYdsrPz7FlLsgX3MTFX+vDZWEYCclhBALTRHRGWfx35e0QuwW/bZj/Aubs0x9JEra4FH4 f2zLI8RYADjx+w9f0BmiS8OVLSPi9oEvhX3oxeaplm+unsg0LLL+X34MGXsaAw== 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 4cxmBF4hjlz10RS; Thu, 30 Oct 2025 01:05:25 +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 59U15PpL007671; Thu, 30 Oct 2025 01:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U15Pvx007668; Thu, 30 Oct 2025 01:05:25 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:05:25 GMT Message-Id: <202510300105.59U15Pvx007668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b5b6ddfc9981 - stable/15 - nfs_clrpcops.c: Check for too large a write reply List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: b5b6ddfc9981f9675cd165fc91d00c205282b716 Auto-Submitted: auto-generated The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b5b6ddfc9981f9675cd165fc91d00c205282b716 commit b5b6ddfc9981f9675cd165fc91d00c205282b716 Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Rick Macklem CommitDate: 2025-10-30 01:02:41 +0000 nfs_clrpcops.c: Check for too large a write reply The "rlen" reply length for a Write operation/RPC could cause trouble if a broken server replies with too large a value. Improve the sanity check for "rlen" to avoid this. (cherry picked from commit 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b) --- sys/fs/nfsclient/nfs_clrpcops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 06e9d9f87628..ec0d3713dc9f 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2212,7 +2212,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) { @@ -7254,7 +7254,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); NFSCL_DEBUG(4, "nfsrpc_writeds: len=%d rlen=%d\n", len, rlen); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) {