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/dir.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/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c6ce8af266ed..c9196c9cf5a6 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -573,11 +573,13 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, if (!pages_ptr) goto out_release_array; do { + unsigned int pglen; status = nfs_readdir_xdr_filler(pages, desc, &entry, file, inode); if (status < 0) break; - status = nfs_readdir_page_filler(desc, &entry, pages_ptr, page, array_size * PAGE_SIZE); + pglen = status; + status = nfs_readdir_page_filler(desc, &entry, pages_ptr, page, pglen); if (status < 0) { if (status == -ENOSPC) status = 0; |