fs/ntfs3: Reject mount if boot's cluster size < media sector size

If we continue to work in this case, then we can corrupt fs.
Fixes: 82cae269cfa9 ("fs/ntfs3: Add initialization of super block").
Reviewed-by: Kari Argillander <kari.argillander@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 800897777eb03855f702e8acf15b39d02c1c2fbf..e9b6a37345769700f682809832d84d8dfc7b9414 100644 (file)
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -763,9 +763,20 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,
        sbi->mft.lbo = mlcn << sbi->cluster_bits;
        sbi->mft.lbo2 = mlcn2 << sbi->cluster_bits;
 
-       if (sbi->cluster_size < sbi->sector_size)
+       /* Compare boot's cluster and sector. */
+       if (sbi->cluster_size < boot_sector_size)
                goto out;
 
+       /* Compare boot's cluster and media sector. */
+       if (sbi->cluster_size < sector_size) {
+               /* No way to use ntfs_get_block in this case. */
+               ntfs_err(
+                       sb,
+                       "Failed to mount 'cause NTFS's cluster size (%u) is less than media sector size (%u)",
+                       sbi->cluster_size, sector_size);
+               goto out;
+       }
+
        sbi->cluster_mask = sbi->cluster_size - 1;
        sbi->cluster_mask_inv = ~(u64)sbi->cluster_mask;
        sbi->record_size = record_size = boot->record_size < 0