Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757487AbYFXNra (ORCPT ); Tue, 24 Jun 2008 09:47:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753410AbYFXNrY (ORCPT ); Tue, 24 Jun 2008 09:47:24 -0400 Received: from kumera.dghda.com ([80.68.90.171]:1267 "EHLO kumera.dghda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753403AbYFXNrX (ORCPT ); Tue, 24 Jun 2008 09:47:23 -0400 From: "Duane Griffin" To: linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, sct@redhat.com, adilger@clusterfs.com, Sami Liedes , Duane Griffin Subject: [PATCH] ext3: handle deleting corrupted indirect blocks Date: Tue, 24 Jun 2008 14:47:20 +0100 Message-Id: <1214315240-22950-1-git-send-email-duaneg@dghda.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <20080607121940.8ee6044a.akpm@linux-foundation.org> References: <20080607121940.8ee6044a.akpm@linux-foundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1621 Lines: 44 While freeing indirect blocks we attach a journal head to the parent buffer head, free the blocks, then journal the parent. If the indirect block list is corrupted and points to the parent the journal head will be detached when the block is cleared, causing an OOPS. Check for that explicitly and handle it gracefully. This patch fixes the third case (image hdb.20000057.nullderef.gz) reported in http://bugzilla.kernel.org/show_bug.cgi?id=10882. Signed-off-by: Duane Griffin --- diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 6ae4ecf..8019bf2 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -2127,7 +2127,20 @@ static void ext3_free_data(handle_t *handle, struct inode *inode, if (this_bh) { BUFFER_TRACE(this_bh, "call ext3_journal_dirty_metadata"); - ext3_journal_dirty_metadata(handle, this_bh); + + /* + * The buffer head should have an attached journal head at this + * point. However, if the data is corrupted and an indirect + * block pointed to itself, it would have been detached when + * the block was cleared. Check for this instead of OOPSing. + */ + if (bh2jh(this_bh)) + ext3_journal_dirty_metadata(handle, this_bh); + else + ext3_error(inode->i_sb, "ext3_free_data", + "circular indirect block detected, " + "inode=%lu, block="E3FSBLK, + inode->i_ino, this_bh->b_blocknr); } } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/