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

Commit bcaa9929 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Theodore Ts'o
Browse files

ext4: ext4_rename should dirty dir_bh with the correct directory 



When ext4_rename performs a directory rename (move), dir_bh is a
buffer that is modified to update the '..' link in the directory being
moved (old_inode).  However, ext4_handle_dirty_metadata is called with
the old parent directory inode (old_dir) and dir_bh, which is
incorrect because dir_bh does not belong to the parent inode.  Fix
this error.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
parent 84ebd795

fs/ext4/namei.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2529,7 +2529,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, 
		PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) =

		PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) =

						cpu_to_le32(new_dir->i_ino);

						cpu_to_le32(new_dir->i_ino);

		BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata");

		BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata");

		retval = ext4_handle_dirty_metadata(handle, old_dir, dir_bh);

		retval = ext4_handle_dirty_metadata(handle, old_inode, dir_bh);

		if (retval) {

		if (retval) {

			ext4_std_error(old_dir->i_sb, retval);

			ext4_std_error(old_dir->i_sb, retval);

			goto end_rename;

			goto end_rename;