From nobody Mon Nov 03 20:29:43 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 4d0jqq6XPvz6Fj6c; Mon, 03 Nov 2025 20:29:43 +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 4d0jqq3hnBz3Kbg; Mon, 03 Nov 2025 20:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201783; 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=0Nh48XrwOVKutd5hzYuVlmUWyRilqvpPU1U/XssNs0M=; b=FD5p9UX0zV+v0Q3ogr2EWiD/7DAf0pdKpQIP9Hyd1HOfV9A5/eKZsbzLF+rSen/bm7JTFw 1T+blJVdLs5D1pweWTb32K4ddAbJ2LZSot0I8UlHAjR+hsknSmB7UzFOHr3ARuxi7lbyyH KdBvMf9M4PPjRO/YiBd5opIJq1Vsn5gQ9YeKT9YruocOc3RlQgtpjwtxXNAnxDUlbdSFQL EgFrIu4TOeG05HX5tA7fkmBtrxFuEIpukvML7L5aWuVD1IQyW4SjAAUT6wWy6ewsjFeKe5 N1cteKJR8HHaevg6FhHZvDu4wVHN4B1+Yzer/OHbuQe/4aWszsfWGHb6InsnFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201783; 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=0Nh48XrwOVKutd5hzYuVlmUWyRilqvpPU1U/XssNs0M=; b=s6Mj/WfUQOGyvEwxT4MPB1grVj6hBORdbqHZFd7zr4IQ8FhGMcI9lVSWG2dHRjTV8h/LTw AOZ7d6oRQTdlnQFVPTP5b2eEoMAGs90+t05+RbGSZnMSlS6FvUtZ4mgzLJxA42z+V/5i1I kR0s9PiVnMgE2xbRc8Ep5TDUJYNVdpRbVBXKJRcCvhTePjQED0CyUmyrNSvzo86Dok4Nvd 44DLcpHA3cFETPZkZVt3WTiz+k8UGIphemo4bUTnze1D//jUiLb3ECCXliDOPkchrzN5k0 4cRVBiCHsKqAOiVEE0jrsGvGDEv3qTpBe5CwvzvI7k3KAaavVHDqnA2ycMhODQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201783; a=rsa-sha256; cv=none; b=eih8wtOewnvptX6ZNno0fxewafnb2rhdfAijcPEIDWxkGtDyvwj7VpUrnwAjlWdDFKjOha Q2DxVpVJd+xclyHi6ppFG20jg1uacDS40vv3hCNrnoAAg2h2Cm48sX/RDp1yPTVNyV5v/R hH+I6fyM1LmCuAtGB/3Lt/XfkeDJNaHGD3AC5dw4b8aNy4jXbPuzSap/mglrv9U8bD0E8A 5FjnSRZLLKWyWfRknxk9O74hsRI2+KXCPdEQL4LiXBcOzdsFXdlMBcG21m3w4/mIdJpuRU KNiT3wKNjQd1bNchFjShvcPDVmA51CQUNqosStHSoFaTpyo120tcULHFe22FPQ== 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 4d0jqq39x4zB1C; Mon, 03 Nov 2025 20:29:43 +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 5A3KThmx051016; Mon, 3 Nov 2025 20:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KThGD051013; Mon, 3 Nov 2025 20:29:43 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:43 GMT Message-Id: <202511032029.5A3KThGD051013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5d37e6975e90 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 5d37e6975e904e3889ee32a82bb255890aab0d68 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5d37e6975e904e3889ee32a82bb255890aab0d68 commit 5d37e6975e904e3889ee32a82bb255890aab0d68 Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28:53 +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. Approved by: re (cperciva) (cherry picked from commit 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b) (cherry picked from commit b5b6ddfc9981f9675cd165fc91d00c205282b716) --- 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) {