From: Chuck Lever <cel@kernel.org>
To: NeilBrown <neil@brown.name>, Jeff Layton <jlayton@kernel.org>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <dai.ngo@oracle.com>, Tom Talpey <tom@talpey.com>
Cc: <linux-nfs@vger.kernel.org>, Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v3 3/5] nfsd: Never cache a COMPOUND when the SEQUENCE operation fails
Date: Fri, 10 Oct 2025 09:56:21 -0400 [thread overview]
Message-ID: <20251010135623.1723-4-cel@kernel.org> (raw)
In-Reply-To: <20251010135623.1723-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
RFC 8881 normatively mandates that operations where the initial
SEQUENCE operation in a compound fails must not modify the slot's
replay cache.
nfsd4_cache_this() doesn't prevent such caching.
Fixes: 468de9e54a90 ("nfsd41: expand solo sequence check")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfsd/nfs4state.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c9053ef4d79f..7b80f00fb32c 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3477,16 +3477,26 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, struct svc_r
}
/*
- * Cache a reply. nfsd4_check_resp_size() has bounded the cache size.
+ * Maybe cache a reply. nfsd4_check_resp_size() has bounded the cache size.
*/
static void
nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
{
- struct xdr_buf *buf = resp->xdr->buf;
+ struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
struct nfsd4_slot *slot = resp->cstate.slot;
+ struct xdr_buf *buf = resp->xdr->buf;
unsigned int base;
- dprintk("--> %s slot %p\n", __func__, slot);
+ /*
+ * RFC 5661 Section 2.10.6.1.2:
+ *
+ * Any time SEQUENCE ... returns an error ... [t]he replier MUST NOT
+ * modify the reply cache entry for the slot whenever an error is
+ * returned from SEQUENCE ...
+ */
+ if (resp->opcnt == 1 && args->ops[0].opnum == OP_SEQUENCE &&
+ resp->cstate.status != nfs_ok)
+ return;
slot->sl_flags |= NFSD4_SLOT_INITIALIZED;
slot->sl_opcnt = resp->opcnt;
--
2.51.0
next prev parent reply other threads:[~2025-10-10 13:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-10 13:56 [PATCH v3 0/5] Fix unwanted memory overwrites Chuck Lever
2025-10-10 13:56 ` [PATCH v3 1/5] NFSD: Skip close replay processing if XDR encoding fails Chuck Lever
2025-10-10 13:56 ` [PATCH v3 2/5] NFSD: Fix the "is this a solo SEQUENCE" predicate Chuck Lever
2025-10-11 0:26 ` NeilBrown
2025-10-10 13:56 ` Chuck Lever [this message]
2025-10-10 15:19 ` [PATCH v3 3/5] nfsd: Never cache a COMPOUND when the SEQUENCE operation fails Jeff Layton
2025-10-11 0:38 ` NeilBrown
2025-10-10 13:56 ` [PATCH v3 4/5] NFSD: Increase minimum size of slot replay cache Chuck Lever
2025-10-10 15:22 ` Jeff Layton
2025-10-11 0:04 ` NeilBrown
2025-10-10 13:56 ` [PATCH v3 5/5] NFSD: Move nfsd4_cache_this() Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251010135623.1723-4-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=dai.ngo@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=okorniev@redhat.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).