diff options
author | Bryan Donlan <bdonlan@gmail.com> | 2009-02-22 21:20:25 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-02-22 21:20:25 -0500 |
commit | e6f009b0b45220c004672d41a58865e94946104d (patch) | |
tree | 99a00ca6486c896b90376238c22a90de3e31cc57 /fs | |
parent | a4912123b688e057084e6557cef8924f7ae5bbde (diff) | |
download | kernel-crypto-e6f009b0b45220c004672d41a58865e94946104d.tar.gz kernel-crypto-e6f009b0b45220c004672d41a58865e94946104d.tar.xz kernel-crypto-e6f009b0b45220c004672d41a58865e94946104d.zip |
ext4: return -EIO not -ESTALE on directory traversal through deleted inode
ext4_iget() returns -ESTALE if invoked on a deleted inode, in order to
report errors to NFS properly. However, in ext4_lookup(), this
-ESTALE can be propagated to userspace if the filesystem is corrupted
such that a directory entry references a deleted inode. This leads to
a misleading error message - "Stale NFS file handle" - and confusion
on the part of the admin.
The bug can be easily reproduced by creating a new filesystem, making
a link to an unused inode using debugfs, then mounting and attempting
to ls -l said link.
This patch thus changes ext4_lookup to return -EIO if it receives
-ESTALE from ext4_iget(), as ext4 does for other filesystem metadata
corruption; and also invokes the appropriate ext*_error functions when
this case is detected.
Signed-off-by: Bryan Donlan <bdonlan@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/namei.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index a5ba1a85809..6e1ad68cdc7 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1077,8 +1077,16 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, stru return ERR_PTR(-EIO); } inode = ext4_iget(dir->i_sb, ino); - if (IS_ERR(inode)) - return ERR_CAST(inode); + if (unlikely(IS_ERR(inode))) { + if (PTR_ERR(inode) == -ESTALE) { + ext4_error(dir->i_sb, __func__, + "deleted inode referenced: %u", + ino); + return ERR_PTR(-EIO); + } else { + return ERR_CAST(inode); + } + } } return d_splice_alias(inode, dentry); } |