Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f79fb48 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 fix decode_free_stateid 



The operation status is decoded in decode_op_hdr.

Stop the print_overflow message that is always hit without this patch:
nfs: decode_free_stateid: prematurely hit end of receive buffer. Remaining
buffer length is 0 words.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b1b3e136

fs/nfs/nfs4xdr.c

+2 −15
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int nfs4_stat_to_errno(int); 
#define decode_test_stateid_maxsz	(op_decode_hdr_maxsz + 2 + 1)

#define encode_free_stateid_maxsz	(op_encode_hdr_maxsz + 1 + \

					 XDR_QUADLEN(NFS4_STATEID_SIZE))

#define decode_free_stateid_maxsz	(op_decode_hdr_maxsz + 1)

#define decode_free_stateid_maxsz	(op_decode_hdr_maxsz)

#else /* CONFIG_NFS_V4_1 */

#define encode_sequence_maxsz	0

#define decode_sequence_maxsz	0
@@ -5966,21 +5966,8 @@ static int decode_test_stateid(struct xdr_stream *xdr, 
static int decode_free_stateid(struct xdr_stream *xdr,

			       struct nfs41_free_stateid_res *res)

{

	__be32 *p;

	int status;



	status = decode_op_hdr(xdr, OP_FREE_STATEID);

	if (status)

		return status;



	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out_overflow;

	res->status = be32_to_cpup(p++);

	res->status = decode_op_hdr(xdr, OP_FREE_STATEID);

	return res->status;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}

#endif /* CONFIG_NFS_V4_1 */