nfs: update maxsz values for SETCLIENTID and EXCHANGE_ID (b8fb2f59) · Commits · 戴 / test

The spec allows for up to NFS4_OPAQUE_LIMIT (1k). While we'll almost certainly never use that much, these ops are generally the only ones in the compound so we might as well allow for them to be that large. Also, the existing code didn't add in a word for the opaque length field for either name string. Fix that while we're in there. Signed-off-by:

Jeff Layton <jeff.layton@primarydata.com> Signed-off-by:

Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/nfs4xdr.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -139,7 +139,8 @@ static int nfs4_stat_to_errno(int);
		#define encode_setclientid_maxsz \
		(op_encode_hdr_maxsz + \
		XDR_QUADLEN(NFS4_VERIFIER_SIZE) + \
		XDR_QUADLEN(NFS4_SETCLIENTID_NAMELEN) + \
		/* client name */ \
		1 + XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + \
		1 /* sc_prog */ + \
		1 + XDR_QUADLEN(RPCBIND_MAXNETIDLEN) + \
		1 + XDR_QUADLEN(RPCBIND_MAXUADDRLEN) + \
		@@ -288,7 +289,8 @@ static int nfs4_stat_to_errno(int);
		#define encode_exchange_id_maxsz (op_encode_hdr_maxsz + \
		encode_verifier_maxsz + \
		1 /* co_ownerid.len */ + \
		XDR_QUADLEN(NFS4_EXCHANGE_ID_LEN) + \
		/* eia_clientowner */ \
		1 + XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + \
		1 /* flags */ + \
		1 /* spa_how */ + \
		/* max is SP4_MACH_CRED (for now) */ + \

Admin message