Skip to content

Commit ff8141e

Browse files
committed
NFSD: Skip close replay processing if XDR encoding fails
The replay logic added by commit 9411b1d ("nfsd4: cleanup handling of nfsv4.0 closed stateid's") cannot be done if encoding failed due to a short send buffer; there's no guarantee that the operation encoder has actually encoded the data that is being copied to the replay cache. Reported-by: rtm@csail.mit.edu Closes: https://lore.kernel.org/linux-nfs/c3628d57-94ae-48cf-8c9e-49087a28cec9@oracle.com/T/#t Fixes: 9411b1d ("nfsd4: cleanup handling of nfsv4.0 closed stateid's") Reviewed-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: NeilBrown <neil@brown.name> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 4aa1714 commit ff8141e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

fs/nfsd/nfs4xdr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5925,8 +5925,7 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
59255925
*/
59265926
warn_on_nonidempotent_op(op);
59275927
xdr_truncate_encode(xdr, op_status_offset + XDR_UNIT);
5928-
}
5929-
if (so) {
5928+
} else if (so) {
59305929
int len = xdr->buf->len - (op_status_offset + XDR_UNIT);
59315930

59325931
so->so_replay.rp_status = op->status;

0 commit comments

Comments
 (0)