aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-05-30 16:28:58 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:13 -0400
commitc04871e6345e4c6dfda564e302d7fd8c66420fd5 (patch)
tree4b2a2b0fb5f282ffd5c95f64691476c647acd29f
parent3873bc50e2271504da45799257f69222774d9550 (diff)
NFSv4: remove obviously bogus comparison from decode_getacl
We just set *acl_len to zero, and attrlen is unsigned, so this comparison is clearly bogus. I have no idea what I was thinking. Fixes a bug that caused getacl to fail over krb5p. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4xdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7c5d70efe720..7e9a840057f2 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -3350,8 +3350,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
3350 attrlen, recvd); 3350 attrlen, recvd);
3351 return -EINVAL; 3351 return -EINVAL;
3352 } 3352 }
3353 if (attrlen <= *acl_len) 3353 xdr_read_pages(xdr, attrlen);
3354 xdr_read_pages(xdr, attrlen);
3355 *acl_len = attrlen; 3354 *acl_len = attrlen;
3356 } else 3355 } else
3357 status = -EOPNOTSUPP; 3356 status = -EOPNOTSUPP;