From: Jeff Layton <jlayton@kernel.org>
To: NeilBrown <neil@brown.name>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Trond Myklebust <trondmy@kernel.org>,
Anna Schumaker <anna@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Chuck Lever <cel@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Alexander Aring <alex.aring@gmail.com>,
Amir Goldstein <amir73il@gmail.com>, Jan Kara <jack@suse.cz>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Calum Mackay <calum.mackay@oracle.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-nfs@vger.kernel.org, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v7 17/20] nfsd: fix reply size estimate for GET_DIR_DELEGATION
Date: Tue, 16 Jun 2026 07:59:00 -0400 [thread overview]
Message-ID: <20260616-dir-deleg-v7-17-6cbc7eac0ade@kernel.org> (raw)
In-Reply-To: <20260616-dir-deleg-v7-0-6cbc7eac0ade@kernel.org>
nfsd4_get_dir_delegation_rsize() returns its estimate in XDR words, but
the COMPOUND reply-size machinery works in bytes: every other op's
_rsize helper multiplies its word count by sizeof(__be32). Since
GET_DIR_DELEGATION is OP_MODIFIES_SOMETHING, this estimate is consulted
before the op executes to ensure the reply will fit. The ~4x too-small
estimate lets a compound near the session/reply limit pass the check,
grant a directory delegation, and then fail to encode the reply with
NFS4ERR_RESOURCE/REP_TOO_BIG, leaving the client without the returned
stateid.
Multiply the estimate by sizeof(__be32) like the other _rsize helpers.
Fixes: 33a1e6ea73e5 ("nfsd: trivial GET_DIR_DELEGATION support")
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/nfsd/nfs4proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 565bf76c08ed..be79b6063afe 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3575,7 +3575,7 @@ static u32 nfsd4_get_dir_delegation_rsize(const struct svc_rqst *rqstp,
op_encode_stateid_maxsz +
2 /* gddr_notification */ +
2 /* gddr_child_attributes */ +
- 2 /* gddr_dir_attributes */);
+ 2 /* gddr_dir_attributes */) * sizeof(__be32);
}
#ifdef CONFIG_NFSD_PNFS
--
2.54.0
next prev parent reply other threads:[~2026-06-16 11:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-16 11:58 [PATCH v7 00/20] nfsd: add support for CB_NOTIFY callbacks in directory delegations Jeff Layton
2026-06-16 11:58 ` [PATCH v7 01/20] nfsd: check fl_lmops in nfsd_breaker_owns_lease() Jeff Layton
2026-06-16 11:58 ` [PATCH v7 02/20] nfsd: add protocol support for CB_NOTIFY Jeff Layton
2026-06-16 11:58 ` [PATCH v7 03/20] nfs_common: add new NOTIFY4_* flags proposed in RFC8881bis Jeff Layton
2026-06-16 11:58 ` [PATCH v7 04/20] nfsd: allow nfsd to get a dir lease with an ignore mask Jeff Layton
2026-06-16 11:58 ` [PATCH v7 05/20] nfsd: update the fsnotify mark when setting or removing a dir delegation Jeff Layton
2026-06-16 11:58 ` [PATCH v7 06/20] nfsd: make nfsd4_callback_ops->prepare operation bool return Jeff Layton
2026-06-16 11:58 ` [PATCH v7 07/20] nfsd: add callback encoding and decoding linkages for CB_NOTIFY Jeff Layton
2026-06-16 11:58 ` [PATCH v7 08/20] nfsd: use RCU to protect fi_deleg_file Jeff Layton
2026-06-16 11:58 ` [PATCH v7 09/20] nfsd: add data structures for handling CB_NOTIFY Jeff Layton
2026-06-16 11:58 ` [PATCH v7 10/20] nfsd: add notification handlers for dir events Jeff Layton
2026-06-16 11:58 ` [PATCH v7 11/20] nfsd: apply the notify mask to the delegation when requested Jeff Layton
2026-06-16 11:58 ` [PATCH v7 12/20] nfsd: add helper to marshal a fattr4 from completed args Jeff Layton
2026-06-16 11:58 ` [PATCH v7 13/20] nfsd: allow nfsd4_encode_fattr4_change() to work with no export Jeff Layton
2026-06-16 11:58 ` [PATCH v7 14/20] nfsd: send basic file attributes in CB_NOTIFY Jeff Layton
2026-06-16 11:58 ` [PATCH v7 15/20] nfsd: allow encoding a filehandle into fattr4 without a svc_fh Jeff Layton
2026-06-16 11:58 ` [PATCH v7 16/20] nfsd: add the filehandle to returned attributes in CB_NOTIFY Jeff Layton
2026-06-16 11:59 ` Jeff Layton [this message]
2026-06-16 11:59 ` [PATCH v7 18/20] nfsd: properly track requested child attributes Jeff Layton
2026-06-16 11:59 ` [PATCH v7 19/20] nfsd: track requested dir attributes Jeff Layton
2026-06-16 11:59 ` [PATCH v7 20/20] nfsd: add support to CB_NOTIFY for dir attribute changes Jeff Layton
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=20260616-dir-deleg-v7-17-6cbc7eac0ade@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=alex.aring@gmail.com \
--cc=amir73il@gmail.com \
--cc=anna@kernel.org \
--cc=brauner@kernel.org \
--cc=calum.mackay@oracle.com \
--cc=cel@kernel.org \
--cc=corbet@lwn.net \
--cc=jack@suse.cz \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=okorniev@redhat.com \
--cc=rostedt@goodmis.org \
--cc=skhan@linuxfoundation.org \
--cc=tom@talpey.com \
--cc=trondmy@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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