diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:48 +0000 |
| commit | 130faf3765d29c961be74f7245eb504a414a68e2 (patch) | |
| tree | df25d9b427876e1b95a3ff8e9f38dddcfce26610 /fs/btrfs/xattr.c | |
| parent | f90ae1b62bedd8b57966a7be68855f2d43170db6 (diff) | |
| parent | 707e840c5e24bb2df1ea4e753964275e257ec816 (diff) | |
Merge tag 'v3.18.26' into linux-linaro-lsk-v3.18lsk-v3.18-16.02
Linux 3.18.26
# gpg: Signature made Mon 25 Jan 2016 15:06:44 GMT using RSA key ID 97772CDC
# gpg: requesting key 97772CDC from hkp server the.earth.li
# gpg: key 97772CDC: public key "Sasha Levin <sasha.levin@oracle.com>" imported
# gpg: no ultimately trusted keys found
# gpg: Total number processed: 1
# gpg: imported: 1 (RSA: 1)
# gpg: Good signature from "Sasha Levin <sasha.levin@oracle.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E27E 5D8A 3403 A2EF 6687 3BBC DEA6 6FF7 9777 2CDC
Diffstat (limited to 'fs/btrfs/xattr.c')
| -rw-r--r-- | fs/btrfs/xattr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 01bad724b5f7..fbb0533e977f 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -309,8 +309,10 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) /* check to make sure this item is what we want */ if (found_key.objectid != key.objectid) break; - if (found_key.type != BTRFS_XATTR_ITEM_KEY) + if (found_key.type > BTRFS_XATTR_ITEM_KEY) break; + if (found_key.type < BTRFS_XATTR_ITEM_KEY) + goto next; di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); if (verify_dir_item(root, leaf, di)) |