Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad8e4e6 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: Fix fs corruption when make_indexed_dir() fails 



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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 74e4e6db

fs/ext4/namei.c

+12 −2
Original line number Diff line number Diff line
@@ -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);

	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);

	if (!(de))

		return retval;

	}

	dx_release(frames);



	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);

	brelse(bh);