Commit 1fcbcf06 authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: fix improper assignment for e_value_offs 

In the process of changing value for existing EA,
there is an improper assignment of e_value_offs(setting to 0),
because it will be reset to incorrect value in the following
loop(shifting EA values before target). Delayed assignment
can avoid this issue.

Link: https://lore.kernel.org/r/20200603084429.25344-1-cgxu519@mykernel.net


Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 0bddd227

fs/ext2/xattr.c

+2 −1
Original line number Diff line number Diff line
@@ -588,7 +588,6 @@ ext2_xattr_set(struct inode *inode, int name_index, const char *name, 
			/* Remove the old value. */

			memmove(first_val + size, first_val, val - first_val);

			memset(first_val, 0, size);

			here->e_value_offs = 0;

			min_offs += size;



			/* Adjust all value offsets. */
@@ -600,6 +599,8 @@ ext2_xattr_set(struct inode *inode, int name_index, const char *name, 
						cpu_to_le16(o + size);

				last = EXT2_XATTR_NEXT(last);

			}



			here->e_value_offs = 0;

		}

		if (value == NULL) {

			/* Remove the old name. */