Commit 995bba43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 fix from Ted Ts'o:
 "Fix a double unlock bug on an error path in ext4, found by smatch and
  syzkaller"

* tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix possible double unlock when moving a directory
parents a3671bd8 70e42fea

fs/ext4/namei.c

+1 −3
Original line number Diff line number Diff line
@@ -3884,11 +3884,9 @@ static int ext4_rename(struct mnt_idmap *idmap, struct inode *old_dir, 
				goto end_rename;

		}

		retval = ext4_rename_dir_prepare(handle, &old);

		if (retval) {

			inode_unlock(old.inode);

		if (retval)

			goto end_rename;

	}

	}

	/*

	 * If we're renaming a file within an inline_data dir and adding or

	 * setting the new dirent causes a conversion from inline_data to