Unverified Commit 09f7c338 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

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: 82cae269 ("fs/ntfs3: Add initialization of super block").

Reviewed-by: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 66019837

fs/ntfs3/super.c

+12 −1
Original line number Diff line number Diff line
@@ -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