From: Trond Myklebust <Trond.Myklebust@netapp.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 5/8] NFS: Fix the error handling in "uncached_readdir()"
Date: Sun, 21 Nov 2010 14:21:19 -0500 [thread overview]
Message-ID: <1290367282-5445-5-git-send-email-Trond.Myklebust@netapp.com> (raw)
In-Reply-To: <1290367282-5445-4-git-send-email-Trond.Myklebust@netapp.com>
Currently, uncached_readdir() is broken because if fails to handle
the results from nfs_readdir_xdr_to_array() correctly.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
fs/nfs/dir.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 353f47c..2492bac 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -766,10 +766,9 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
desc->page_index = 0;
desc->page = page;
- if (nfs_readdir_xdr_to_array(desc, page, inode) == -1) {
- status = -EIO;
+ status = nfs_readdir_xdr_to_array(desc, page, inode);
+ if (status < 0)
goto out_release;
- }
status = nfs_do_filldir(desc, dirent, filldir);
--
1.7.3.2
next prev parent reply other threads:[~2010-11-21 19:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-21 19:21 [PATCH 1/8] NFS: Buffer overflow in ->decode_dirent() should not be fatal Trond Myklebust
2010-11-21 19:21 ` [PATCH 2/8] NFS: Assume eof if the server returns no readdir records Trond Myklebust
2010-11-21 19:21 ` [PATCH 3/8] NFS: Fix a page leak in nfs_do_filldir() Trond Myklebust
2010-11-21 19:21 ` [PATCH 4/8] NFS: Fix a page leak in uncached_readdir() Trond Myklebust
2010-11-21 19:21 ` Trond Myklebust [this message]
2010-11-21 19:21 ` [PATCH 6/8] NFS: Don't ignore errors from nfs_do_filldir() Trond Myklebust
2010-11-21 19:21 ` [PATCH 7/8] NFS: Correct the array bound calculation in nfs_readdir_add_to_array Trond Myklebust
2010-11-21 19:21 ` [PATCH 8/8] NFS: Ensure we return the dirent->d_type when it is known Trond Myklebust
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290367282-5445-5-git-send-email-Trond.Myklebust@netapp.com \
--to=trond.myklebust@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.