From nobody Mon Oct 27 14:52:28 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 4cwGgw3twLz6Dnh3; Mon, 27 Oct 2025 14:52:28 +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 4cwGgw2lPjz3pxg; Mon, 27 Oct 2025 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576748; 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=dLT5/6MqcW8IKbpU0uV92xQyWCrvIu+aT/6BFmh7Uo8=; b=xJEhY9ANLc4Pmz/GX6Ny5IXK+xD79FiJRa0vDTbQE9eqnkUMSaz46Oh3+D+yT7rg5yR0hl +EA2kMXcmZj5X6BJqK64ZarHp29tzJSCaXBUguLwzMLjIZ+RaURyXzXEUVz/BL1AFKNg7O LDXprUX1+AKZuLKRKSDqSvqoG/j7QXbO8tCkeI8q0jRZJ2ax2EylPl1p+CAureltOWg1bu Bb7MrMmVUXFhuKpEC9bwav+HdRH6rCpjRst7IUmfEv3K5e8qLZuvGDke+aeQ+bU7Dyqa34 5NNc0lrk7jFpQAKZQwuf405OnOJZKwJaJuQ32qZejxErGd5Dvf2vXZ+HmNCg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576748; 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=dLT5/6MqcW8IKbpU0uV92xQyWCrvIu+aT/6BFmh7Uo8=; b=W1Ff0HVPQ3uKACPhUfJq372jauBM82jSBF3uTObeNZo3KEpn5Lsn1trUkCRvLATGicsSz/ pqEhzysINKiKi3fKomNO8zAypbiHRFhESTvyCFUrQSN9/XvGIFkiSCaiac/hD+ynIEw5xo tArbTmD3MyYIef3aB3k/5Vrt4s7ei1rNIPDU2578Rw63l6NRj2n9V6THZ8WDFdKU3Jp3JH 1mJwcqwfKM8RHgTDs+SPr6FFCj9t2lFd8Ax3u4XvMq4EVAgcYRDoigEKTa1XH001xPJ8ek I+hhkUrxkt3IG4yOqTkwtnnIs2p60KHEWptxGirBBRTSaW8+UXkpXQGjf4KeSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761576748; a=rsa-sha256; cv=none; b=TILz6h7qLSCbQE9ElQgi7JLlhVQpbtBzsEPgOmVjzKx+XGWLFWNz50wQpD4YVZzdci5Rjn jko1jsbdsOrwP25o8lZiHRCs5NfyVOjVnBcV08T6td91GATZYCoQywp89yNmkzG+32oEwk fWUFzBdK8CUiE/pN+SFiA01KqOn16gDV1oqkn6KKamaDkKivitjn8UZqUtfX0Um0t9DVra gpFZiSZqnbUbFZWUkKyHG15sdVFR9A8E/u8HONaHfS5c/oyWueallKWhPGrgIwHXkYEOwW W7rX68PZjqA47pfx1LQuH0U8NBgkPB9GSCmErCowdiYtse+fcjjzk5CWuW9iUw== 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 4cwGgw29Q0z1MWj; Mon, 27 Oct 2025 14:52:28 +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 59REqStO001086; Mon, 27 Oct 2025 14:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REqSOZ001083; Mon, 27 Oct 2025 14:52:28 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:52:28 GMT Message-Id: <202510271452.59REqSOZ001083@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: 2c82cdd2e29f - main - nfs_clrpcops.c: Check for too large a write reply 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: 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b commit 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:49:32 +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. Reported by: Ilja Van Sprundel Reviewed by: emaste, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53368 --- 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 c8a130c34412..983eb8b9226f 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) { @@ -7257,7 +7257,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) {