aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-11-01 16:56:58 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:02 -0500
commitee1a95b3b3fccf3c825bd95f89a8e006901b03ed (patch)
tree6b690c38cd2d2e9ef782dc1150d2cfccb205dd2f
parent48df020aa17ac95a012ff765b0086ede5996b320 (diff)
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: Chuck Lever <chuck.lever@oracle.com> Acked-By: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfs3xdr.c4
-rw-r--r--fs/nfsd/nfsxdr.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index f917fd25858a..c02b8d69297d 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -88,10 +88,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp)
88 * no slashes or null bytes. 88 * no slashes or null bytes.
89 */ 89 */
90static __be32 * 90static __be32 *
91decode_filename(__be32 *p, char **namp, int *lenp) 91decode_filename(__be32 *p, char **namp, unsigned int *lenp)
92{ 92{
93 char *name; 93 char *name;
94 int i; 94 unsigned int i;
95 95
96 if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS3_MAXNAMLEN)) != NULL) { 96 if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS3_MAXNAMLEN)) != NULL) {
97 for (i = 0, name = *namp; i < *lenp; i++, name++) { 97 for (i = 0, name = *namp; i < *lenp; i++, name++) {
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index b86e3658a0af..50bd6187edfc 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -62,10 +62,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp)
62 * no slashes or null bytes. 62 * no slashes or null bytes.
63 */ 63 */
64static __be32 * 64static __be32 *
65decode_filename(__be32 *p, char **namp, int *lenp) 65decode_filename(__be32 *p, char **namp, unsigned int *lenp)
66{ 66{
67 char *name; 67 char *name;
68 int i; 68 unsigned int i;
69 69
70 if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS_MAXNAMLEN)) != NULL) { 70 if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS_MAXNAMLEN)) != NULL) {
71 for (i = 0, name = *namp; i < *lenp; i++, name++) { 71 for (i = 0, name = *namp; i < *lenp; i++, name++) {