When directory hiearchy is corrupted and contains cycles, d_splice_alias() can fail. Warn user and mark filesystem as with errors when that happens. Signed-off-by: Jan Kara <jack@xxxxxxx> --- fs/ext4/namei.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 5845cd9..0cb1a94 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1317,6 +1317,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, stru struct inode *inode; struct ext4_dir_entry_2 *de; struct buffer_head *bh; + struct dentry *ret; if (dentry->d_name.len > EXT4_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); @@ -1344,7 +1345,10 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, stru return ERR_PTR(-EIO); } } - return d_splice_alias(inode, dentry); + ret = d_splice_alias(inode, dentry); + if (IS_ERR(ret)) + EXT4_ERROR_INODE(dir, "directory corrupted"); + return ret; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
