fs/ntfs3: Check reserved size for maximum allowed

Also don't mask EFBIG
Fixes xfstest generic/485
Fixes: 4342306f0f0d ("fs/ntfs3: Add file operations and implementation")
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index 3e9aefcb3e6c15078c25b59b4f92d61e7109e0fd..c9b7181436039e3410660a90119db212c8301398 100644 (file)
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -2114,9 +2114,11 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)
 
        if (!attr_b->non_res) {
                data_size = le32_to_cpu(attr_b->res.data_size);
+               alloc_size = data_size;
                mask = sbi->cluster_mask; /* cluster_size - 1 */
        } else {
                data_size = le64_to_cpu(attr_b->nres.data_size);
+               alloc_size = le64_to_cpu(attr_b->nres.alloc_size);
                mask = (sbi->cluster_size << attr_b->nres.c_unit) - 1;
        }
 
@@ -2130,6 +2132,13 @@ int attr_insert_range(struct ntfs_inode *ni, u64 vbo, u64 bytes)
                return -EINVAL;
        }
 
+       /*
+        * valid_size <= data_size <= alloc_size
+        * Check alloc_size for maximum possible.
+        */
+       if (bytes > sbi->maxbytes_sparse - alloc_size)
+               return -EFBIG;
+
        vcn = vbo >> sbi->cluster_bits;
        len = bytes >> sbi->cluster_bits;
 

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index bdffe4b8554bd18cd684b05af2ef71b782496bac..cf16bde810cce760441fd1febb8e229d1325d99c 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -733,9 +733,6 @@ out:
        if (map_locked)
                filemap_invalidate_unlock(mapping);
 
-       if (err == -EFBIG)
-               err = -ENOSPC;
-
        if (!err) {
                inode->i_ctime = inode->i_mtime = current_time(inode);
                mark_inode_dirty(inode);