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/ext2/namei.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index f663a67..b3f074b 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c @@ -59,6 +59,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str { struct inode * inode; ino_t ino; + struct dentry *ret; if (dentry->d_name.len > EXT2_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); @@ -74,7 +75,12 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str return ERR_PTR(-EIO); } } - return d_splice_alias(inode, dentry); + ret = d_splice_alias(inode, dentry); + if (IS_ERR(ret)) { + ext2_error(dir->i_sb, __func__, "directory #%lu corrupted", + dir->i_ino); + } + return ret; } struct dentry *ext2_get_parent(struct dentry *child) -- 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