fs/ntfs3: Improved checking of attribute's name length

Added comment, added null pointer checking.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 059f288784580548266777380cee325c26b832cb..3d2e4c1270e49af37773fc6b7d2f40054804f71d 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -137,7 +137,13 @@ next_attr:
        rsize = attr->non_res ? 0 : le32_to_cpu(attr->res.data_size);
        asize = le32_to_cpu(attr->size);
 
-       if (le16_to_cpu(attr->name_off) + attr->name_len > asize)
+       /*
+        * Really this check was done in 'ni_enum_attr_ex' -> ... 'mi_enum_attr'.
+        * There not critical to check this case again
+        */
+       if (attr->name_len &&
+           sizeof(short) * attr->name_len + le16_to_cpu(attr->name_off) >
+                   asize)
                goto out;
 
        if (attr->non_res) {