Merge 4.4.154 into android-4.4-p

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / ext4 / xattr.c

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index b16bfb5..a9b96d7 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -197,6 +197,8 @@ ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,
                struct ext4_xattr_entry *next = EXT4_XATTR_NEXT(e);
                if ((void *)next >= end)
                        return -EFSCORRUPTED;
+               if (strnlen(e->e_name, e->e_name_len) != e->e_name_len)
+                       return -EFSCORRUPTED;
                e = next;
        }