From nobody Thu Oct 30 01:24:22 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 4cxmc64tkKz6DQxB; Thu, 30 Oct 2025 01:24:22 +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 4cxmc64KCVz3kDC; Thu, 30 Oct 2025 01:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761787462; 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=LDVHBOPqi8XNuesjn+Rpb0UG/5uCKuTxc6euCiaxmZ4=; b=yWQiyJ1KjbTl2UZJR7AXNCcdLtXdNBhLbjtemBTGOYJLjp82xp1r5umPNGJkxYDNFdg0sq GtdcXoZOyFJxuXmkIrBXQ3jz3I7fut+PxFpCILjxgCn0wGhYmRVi5dWacHd47E4mEP8VUw PEQJ1I/jIGeR+HI4lkicdxPRN79VN80w1wSWZEh3bcqLtfjOf9V08SWjwc+lA111FMGPyX e05XVrd9LVMuKKz/1cs60hI0SrgY3T9AkVcPtsMcYC2KD5TKyUzByGhQ6lE16mQUPe6LBD arZaMcqRWvAU8CXuPZXTjBKpUYKnHmE4/8auEB6wJc62iSJMTtG+fso8r0nJGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761787462; 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=LDVHBOPqi8XNuesjn+Rpb0UG/5uCKuTxc6euCiaxmZ4=; b=dN0ZKsRINIl6LjCA6nBjruVlWAEJiK0jMzZ2/1n6Y+xHt3tmg5VuMYQBvOENFAj/zNV4R1 C+jxgWlyFEzxASSd+B9KY8RXe1z3LGO5aCEDMluKGKygWCZDFCyCmGyWcPWNZMg9n0XN6r 8aJN+7PsCSy+qHF7ThVX1Ff25G0UUOOswNtH1ag2spAuu4wt0Du0KALPDRkzELiWTXWIqt Fppq0heQMaItb/uJkI2NBtVP+camxbzimSfQjDFKfX958GyfJAddJAZQpkezHWn+BqFoyB 2RuX5JzxZmFkxzwUKxs8fwwOOwBNf+9ietImlasza9TdWQkkEZos38Gf2iMxMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761787462; a=rsa-sha256; cv=none; b=cHsvzUKS1DJBbO4pEFSbqFTGzDzbvtfpHCu+do8ax3dEkfDZFujrOSQr3MqXa0g2Tr8udl zzdt+s3y7CZsgcP4qctrtHSINGlfHPlLp+t95+jHQBCVJjViaFCWMXisSzSHmmeQS8DQ+x /jBR1fGSbyLtvdEzCT+qcbTmmX6ArU7gJiqbnQ4jC08EhSQktY6d8Dmlr46C+QZUTwISeO 8c/iFz9tOSElHfQhFnMgVOSJ1clrU3UKn6YGWtJ07pmUNPfYtoOYDMN+N/ZnbSLdcCX+sT 0PDBrPe9A3Cjj6SOEv9wN6s5JB5Q6Umyg4Sf/nn6p4xH6dN7mJfyHCNOFfbkqw== 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 4cxmc63lckz11T2; Thu, 30 Oct 2025 01:24:22 +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 59U1OMMx044753; Thu, 30 Oct 2025 01:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1OM9Y044750; Thu, 30 Oct 2025 01:24:22 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:24:22 GMT Message-Id: <202510300124.59U1OM9Y044750@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: f262601ebaff - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f262601ebaffafa4d258844071e16a63fb5eb43d Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f262601ebaffafa4d258844071e16a63fb5eb43d commit f262601ebaffafa4d258844071e16a63fb5eb43d Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Rick Macklem CommitDate: 2025-10-30 01:21:44 +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 bc8611f4c119..c5483623a9a5 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2208,7 +2208,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) { @@ -7128,7 +7128,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) {