diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index d563abc3e136..e7366f74ff62 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -607,6 +607,16 @@ static int ntfs_attr_find(const ATTR_TYPE type, const ntfschar *name,
                 * If @name is present, compare the two names.  If @name is
                 * missing, assume we want an unnamed attribute.
                 */
+
+               /*
+                * Sanity check, a->name_offset should be within the range of a->lengh,
+                */
+               if (name && ((u8*)a + le16_to_cpu(a->name_offset)) > ((u8*)a + le32_to_cpu(a->length))) {
+                       ntfs_error(vol->sb, "Invalid Attribute Name. Inode is corrupt.  Run chkdsk.");
+                       NVolSetErrors(vol);
+                       return -EIO;
+               }
+
                if (!name) {
                        /* The search failed if the found attribute is named. */
                        if (a->name_length)