aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuane Griffin <duaneg@dghda.com>2008-07-11 19:27:31 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-07-11 19:27:31 -0400
commit71dc8fbcf5f6363342bd636a646eeac7cfef25c3 (patch)
treee878c1c7e24115ac63d93976f4382280db006ae7
parent91ef4caf800030fa6e5224b8a41f8c74787b303d (diff)
ext4: handle deleting corrupted indirect blocks
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 <duaneg@dghda.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/ext4/inode.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 269763b66361..7cce96a6935e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2179,7 +2179,21 @@ static void ext4_free_data(handle_t *handle, struct inode *inode,
2179 2179
2180 if (this_bh) { 2180 if (this_bh) {
2181 BUFFER_TRACE(this_bh, "call ext4_journal_dirty_metadata"); 2181 BUFFER_TRACE(this_bh, "call ext4_journal_dirty_metadata");
2182 ext4_journal_dirty_metadata(handle, this_bh); 2182
2183 /*
2184 * The buffer head should have an attached journal head at this
2185 * point. However, if the data is corrupted and an indirect
2186 * block pointed to itself, it would have been detached when
2187 * the block was cleared. Check for this instead of OOPSing.
2188 */
2189 if (bh2jh(this_bh))
2190 ext4_journal_dirty_metadata(handle, this_bh);
2191 else
2192 ext4_error(inode->i_sb, __func__,
2193 "circular indirect block detected, "
2194 "inode=%lu, block=%llu",
2195 inode->i_ino,
2196 (unsigned long long) this_bh->b_blocknr);
2183 } 2197 }
2184} 2198}
2185 2199