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

Commit 7071b715 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Theodore Ts'o
Browse files

ext4: fix bh leak on error paths in ext4_rename() and ext4_cross_rename() 



Release references to buffer-heads if ext4_journal_start() fails.

Fixes: 5b61de75 ("ext4: start handle at least possible moment when renaming files")
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 1efff914

fs/ext4/namei.c

+15 −6
Original line number Diff line number Diff line
@@ -3264,12 +3264,18 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, 
		   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2);

	if (!(flags & RENAME_WHITEOUT)) {

		handle = ext4_journal_start(old.dir, EXT4_HT_DIR, credits);

		if (IS_ERR(handle))

			return PTR_ERR(handle);

		if (IS_ERR(handle)) {

			retval = PTR_ERR(handle);

			handle = NULL;

			goto end_rename;

		}

	} else {

		whiteout = ext4_whiteout_for_rename(&old, credits, &handle);

		if (IS_ERR(whiteout))

			return PTR_ERR(whiteout);

		if (IS_ERR(whiteout)) {

			retval = PTR_ERR(whiteout);

			whiteout = NULL;

			goto end_rename;

		}

	}



	if (IS_DIRSYNC(old.dir) || IS_DIRSYNC(new.dir))
@@ -3433,8 +3439,11 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	handle = ext4_journal_start(old.dir, EXT4_HT_DIR,

		(2 * EXT4_DATA_TRANS_BLOCKS(old.dir->i_sb) +

		 2 * EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2));

	if (IS_ERR(handle))

		return PTR_ERR(handle);

	if (IS_ERR(handle)) {

		retval = PTR_ERR(handle);

		handle = NULL;

		goto end_rename;

	}



	if (IS_DIRSYNC(old.dir) || IS_DIRSYNC(new.dir))

		ext4_handle_sync(handle);