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

Commit 86ebfd08 authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: journal all modifications in ext4_xattr_set_handle 



ext4_xattr_set_handle() was zeroing out an inode outside
of journaling constraints; this is one of the accesses that
was causing the crc errors in journal replay as seen in
kernel.org bugzilla #14354.

Reviewed-by: default avatarAndreas Dilger <adilger@sun.com>
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
parent 30c6e07a

fs/ext4/xattr.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -988,6 +988,10 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, 
	if (error)

	if (error)

		goto cleanup;

		goto cleanup;





	error = ext4_journal_get_write_access(handle, is.iloc.bh);

	if (error)

		goto cleanup;



	if (EXT4_I(inode)->i_state & EXT4_STATE_NEW) {

	if (EXT4_I(inode)->i_state & EXT4_STATE_NEW) {

		struct ext4_inode *raw_inode = ext4_raw_inode(&is.iloc);

		struct ext4_inode *raw_inode = ext4_raw_inode(&is.iloc);

		memset(raw_inode, 0, EXT4_SB(inode->i_sb)->s_inode_size);

		memset(raw_inode, 0, EXT4_SB(inode->i_sb)->s_inode_size);
@@ -1013,9 +1017,6 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, 
		if (flags & XATTR_CREATE)

		if (flags & XATTR_CREATE)

			goto cleanup;

			goto cleanup;

	}

	}

	error = ext4_journal_get_write_access(handle, is.iloc.bh);

	if (error)

		goto cleanup;

	if (!value) {

	if (!value) {

		if (!is.s.not_found)

		if (!is.s.not_found)

			error = ext4_xattr_ibody_set(handle, inode, &i, &is);

			error = ext4_xattr_ibody_set(handle, inode, &i, &is);