From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: [PATCH 3/5] ext3: Handle error from d_splice_alias() Date: Wed, 20 Jun 2012 22:58:38 +0200 Message-ID: <1340225920-29379-3-git-send-email-jack@suse.cz> References: <1340225920-29379-1-git-send-email-jack@suse.cz> Cc: linux-fsdevel@vger.kernel.org, Jan Kara To: Al Viro Return-path: Received: from cantor2.suse.de ([195.135.220.15]:43465 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908Ab2FTU6n (ORCPT ); Wed, 20 Jun 2012 16:58:43 -0400 In-Reply-To: <1340225920-29379-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 --- fs/ext3/namei.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index eeb63df..febb9f1 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -1016,6 +1016,7 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str struct inode * inode; struct ext3_dir_entry_2 * de; struct buffer_head * bh; + struct dentry *ret; if (dentry->d_name.len > EXT3_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); @@ -1038,7 +1039,12 @@ static struct dentry *ext3_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)) { + ext3_error(dir->i_sb, __func__, "directory #%lu corrupted", + dir->i_ino); + } + return ret; } -- 1.7.1