diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-04-10 07:37:36 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-04-10 07:37:36 +0300 |
| commit | e5d01196c0428a206f307e9ee5f6842964098ff0 (patch) | |
| tree | df828a46009c763a261cc93003a1af3e3c279295 /fs/ext4 | |
| parent | 345c0dbf3a30872d9b204db96b5857cd00808cae (diff) | |
| download | linux-e5d01196c0428a206f307e9ee5f6842964098ff0.tar.xz | |
ext4: ignore e_value_offs for xattrs with value-in-ea-inode
In other places in fs/ext4/xattr.c, if e_value_inum is non-zero, the
code ignores the value in e_value_offs. The e_value_offs *should* be
zero, but we shouldn't depend upon it, since it might not be true in a
corrupted/fuzzed file system.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202897
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202877
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index dc82e7757f67..491f9ee4040e 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1696,7 +1696,7 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i, /* No failures allowed past this point. */ - if (!s->not_found && here->e_value_size && here->e_value_offs) { + if (!s->not_found && here->e_value_size && !here->e_value_inum) { /* Remove the old value. */ void *first_val = s->base + min_offs; size_t offs = le16_to_cpu(here->e_value_offs); |