Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / fs / exfat / super.c

diff --git a/fs/exfat/super.c b/fs/exfat/super.c
index 87be5bf..c6d8d2e 100644 (file)
--- a/fs/exfat/super.c
+++ b/fs/exfat/super.c
@@ -381,8 +381,7 @@ static int exfat_calibrate_blocksize(struct super_block *sb, int logical_sect)
 {
        struct exfat_sb_info *sbi = EXFAT_SB(sb);
 
-       if (!is_power_of_2(logical_sect) ||
-           logical_sect < 512 || logical_sect > 4096) {
+       if (!is_power_of_2(logical_sect)) {
                exfat_err(sb, "bogus logical sector size %u", logical_sect);
                return -EIO;
        }
@@ -451,6 +450,25 @@ static int exfat_read_boot_sector(struct super_block *sb)
                return -EINVAL;
        }
 
+       /*
+        * sect_size_bits could be at least 9 and at most 12.
+        */
+       if (p_boot->sect_size_bits < EXFAT_MIN_SECT_SIZE_BITS ||
+           p_boot->sect_size_bits > EXFAT_MAX_SECT_SIZE_BITS) {
+               exfat_err(sb, "bogus sector size bits : %u\n",
+                               p_boot->sect_size_bits);
+               return -EINVAL;
+       }
+
+       /*
+        * sect_per_clus_bits could be at least 0 and at most 25 - sect_size_bits.
+        */
+       if (p_boot->sect_per_clus_bits > EXFAT_MAX_SECT_PER_CLUS_BITS(p_boot)) {
+               exfat_err(sb, "bogus sectors bits per cluster : %u\n",
+                               p_boot->sect_per_clus_bits);
+               return -EINVAL;
+       }
+
        sbi->sect_per_clus = 1 << p_boot->sect_per_clus_bits;
        sbi->sect_per_clus_bits = p_boot->sect_per_clus_bits;
        sbi->cluster_size_bits = p_boot->sect_per_clus_bits +
@@ -477,16 +495,19 @@ static int exfat_read_boot_sector(struct super_block *sb)
        sbi->used_clusters = EXFAT_CLUSTERS_UNTRACKED;
 
        /* check consistencies */
-       if (sbi->num_FAT_sectors << p_boot->sect_size_bits <
-           sbi->num_clusters * 4) {
+       if ((u64)sbi->num_FAT_sectors << p_boot->sect_size_bits <
+           (u64)sbi->num_clusters * 4) {
                exfat_err(sb, "bogus fat length");
                return -EINVAL;
        }
+
        if (sbi->data_start_sector <
-           sbi->FAT1_start_sector + sbi->num_FAT_sectors * p_boot->num_fats) {
+           (u64)sbi->FAT1_start_sector +
+           (u64)sbi->num_FAT_sectors * p_boot->num_fats) {
                exfat_err(sb, "bogus data start sector");
                return -EINVAL;
        }
+
        if (sbi->vol_flags & VOLUME_DIRTY)
                exfat_warn(sb, "Volume was not properly unmounted. Some data may be corrupt. Please run fsck.");
        if (sbi->vol_flags & MEDIA_FAILURE)