diff options
| author | Chengguang Xu <cgxu519@mykernel.net> | 2020-06-03 16:44:29 +0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2020-07-09 08:14:00 +0200 |
| commit | 1fcbcf06e4f159e0db39a53fe258336febbba804 (patch) | |
| tree | cbf155005e48f2c872babaa20760cca8039c030f | |
| parent | 0bddd227f3dc55975e2b8dfa7fc6f959b062a2c7 (diff) | |
| download | linux-stable-1fcbcf06e4f159e0db39a53fe258336febbba804.tar.gz linux-stable-1fcbcf06e4f159e0db39a53fe258336febbba804.tar.bz2 linux-stable-1fcbcf06e4f159e0db39a53fe258336febbba804.zip | |
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: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/ext2/xattr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index 943cc469f42f..c802ea682e7f 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -588,7 +588,6 @@ bad_block: /* 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 @@ bad_block: cpu_to_le16(o + size); last = EXT2_XATTR_NEXT(last); } + + here->e_value_offs = 0; } if (value == NULL) { /* Remove the old name. */ |