From patchwork Tue May 29 20:07:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 161794 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C9CB2B6FCA for ; Wed, 30 May 2012 06:08:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755055Ab2E2UH7 (ORCPT ); Tue, 29 May 2012 16:07:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42499 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754735Ab2E2UH4 (ORCPT ); Tue, 29 May 2012 16:07:56 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 09A8E975D0; Tue, 29 May 2012 22:07:55 +0200 (CEST) Received: by quack.suse.cz (Postfix, from userid 1000) id 1DE352061C; Tue, 29 May 2012 22:07:52 +0200 (CEST) From: Jan Kara To: Al Viro Cc: Ted Tso , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, Jan Kara Subject: [PATCH 4/4] ext4: Handle error from d_splice_alias() Date: Tue, 29 May 2012 22:07:47 +0200 Message-Id: <1338322067-17566-5-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1338322067-17566-1-git-send-email-jack@suse.cz> References: <1338322067-17566-1-git-send-email-jack@suse.cz> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org When directory hiearchy is corrupted and contains cycles, d_splice_alias() can fail. Handle the failure cleanly. Signed-off-by: Jan Kara --- fs/ext4/namei.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index e2a3f4b..fc65520 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1024,6 +1024,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); @@ -1045,7 +1046,12 @@ 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"); + iput(inode); + } + return ret; }