diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-11-16 02:26:22 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-11-16 02:44:29 +0100 |
| commit | ac39612824e1fad8baf82c2841e42b2142af3445 (patch) | |
| tree | 12a841ca751a50f324dc97963579002943d0c3c9 /fs/nfs/nfs3xdr.c | |
| parent | NFS: Fix a couple of regressions in readdir. (diff) | |
| download | linux-ac39612824e1fad8baf82c2841e42b2142af3445.tar.xz linux-ac39612824e1fad8baf82c2841e42b2142af3445.zip | |
NFS: readdir shouldn't read beyond the reply returned by the server
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs3xdr.c')
| -rw-r--r-- | fs/nfs/nfs3xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index d9a5e832c257..748dc91a4a14 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -555,7 +555,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res struct page **page; size_t hdrlen; u32 recvd, pglen; - int status, nr = 0; + int status; status = ntohl(*p++); /* Decode post_op_attrs */ @@ -586,7 +586,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res pglen = recvd; page = rcvbuf->pages; - return nr; + return pglen; } __be32 * |