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

Commit ee1a95b3 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Use unsigned length argument for decode_filename 



Clean up: file name lengths are unsigned on the wire, negative lengths
are not meaningful natively either.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Acked-By: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 48df020a

fs/nfsd/nfs3xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp) 
 * no slashes or null bytes.

 */

static __be32 *

decode_filename(__be32 *p, char **namp, int *lenp)

decode_filename(__be32 *p, char **namp, unsigned int *lenp)

{

	char		*name;

	int		i;

	unsigned int	i;



	if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS3_MAXNAMLEN)) != NULL) {

		for (i = 0, name = *namp; i < *lenp; i++, name++) {

fs/nfsd/nfsxdr.c

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp) 
 * no slashes or null bytes.

 */

static __be32 *

decode_filename(__be32 *p, char **namp, int *lenp)

decode_filename(__be32 *p, char **namp, unsigned int *lenp)

{

	char		*name;

	int		i;

	unsigned int	i;



	if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS_MAXNAMLEN)) != NULL) {

		for (i = 0, name = *namp; i < *lenp; i++, name++) {