Patchwork [1/2] ext4: Fix fs corruption when make_indexed_dir() fails

login
register
mail settings
Submitter Jan Kara
Date April 29, 2011, 9:23 p.m.
Message ID <1304112212-23417-1-git-send-email-jack@suse.cz>
Download mbox | patch
Permalink /patch/93478/
State Accepted
Headers show

Comments

Jan Kara - April 29, 2011, 9:23 p.m.
When make_indexed_dir() fails (e.g. because of ENOSPC) after it has allocated
block for index tree root, we did not properly mark all changed buffers dirty.
This lead to only some of these buffers being written out and thus effectively
corrupting the directory.

Fix the issue by marking all changed data dirty even in the error failure case.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/namei.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
Theodore Ts'o - May 3, 2011, 3:11 p.m.
On Fri, Apr 29, 2011 at 11:23:32PM +0200, Jan Kara wrote:
> When make_indexed_dir() fails (e.g. because of ENOSPC) after it has
> allocated block for index tree root, we did not properly mark all
> changed buffers dirty.  This lead to only some of these buffers
> being written out and thus effectively corrupting the directory.
> 
> Fix the issue by marking all changed data dirty even in the error
> failure case.
> 
> Signed-off-by: Jan Kara <jack@suse.cz>

Thanks, added to the ext4 tree.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 67fd0b0..cadf04b 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1414,9 +1414,19 @@  static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
 	frame->bh = bh;
 	bh = bh2;
 	de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
-	dx_release (frames);
-	if (!(de))
+	if (!de) {
+		/*
+		 * Even if the block split failed, we have to properly write
+		 * out all the changes we did so far. Otherwise we can end up
+		 * with corrupted filesystem.
+		 */
+		ext4_mark_inode_dirty(handle, dir);
+		ext4_handle_dirty_metadata(handle, dir, frame->bh);
+		ext4_handle_dirty_metadata(handle, dir, bh);
+		dx_release(frames);
 		return retval;
+	}
+	dx_release(frames);
 
 	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
 	brelse(bh);