Commit 7e01a69f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-7.0-rc1.minix' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull minix update from Christian Brauner:
 "Consolidate and strengthen superblock validation in
  minix_check_superblock()

  The minix filesystem driver does not validate several superblock
  fields before using them during mount, allowing a crafted filesystem
  image to trigger out-of-bounds accesses (reported by syzbot)"

* tag 'vfs-7.0-rc1.minix' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  minix: Add required sanity checking to minix_check_superblock()
parents 6124fa45 8c97a6dd

fs/minix/inode.c

+29 −21
Original line number Diff line number Diff line
@@ -170,9 +170,37 @@ static int minix_reconfigure(struct fs_context *fc) 
static bool minix_check_superblock(struct super_block *sb)

{

	struct minix_sb_info *sbi = minix_sb(sb);

	unsigned long block;



	if (sbi->s_imap_blocks == 0 || sbi->s_zmap_blocks == 0)

	if (sbi->s_log_zone_size != 0) {

		printk("minix-fs error: zone size must equal block size. "

		       "s_log_zone_size > 0 is not supported.\n");

		return false;

	}



	if (sbi->s_ninodes < 1 || sbi->s_firstdatazone <= 4 ||

	    sbi->s_firstdatazone >= sbi->s_nzones)

		return false;



	/* Apparently minix can create filesystems that allocate more blocks for

	 * the bitmaps than needed.  We simply ignore that, but verify it didn't

	 * create one with not enough blocks and bail out if so.

	 */

	block = minix_blocks_needed(sbi->s_ninodes, sb->s_blocksize);

	if (sbi->s_imap_blocks < block) {

		printk("MINIX-fs: file system does not have enough "

		       "imap blocks allocated. Refusing to mount.\n");

		return false;

	}



	block = minix_blocks_needed(

			(sbi->s_nzones - sbi->s_firstdatazone + 1),

			sb->s_blocksize);

	if (sbi->s_zmap_blocks < block) {

		printk("MINIX-fs: file system does not have enough "

		       "zmap blocks allocated. Refusing to mount.\n");

		return false;

	}



	/*

	 * s_max_size must not exceed the block mapping limitation.  This check
@@ -293,26 +321,6 @@ static int minix_fill_super(struct super_block *s, struct fs_context *fc) 
	minix_set_bit(0,sbi->s_imap[0]->b_data);

	minix_set_bit(0,sbi->s_zmap[0]->b_data);



	/* Apparently minix can create filesystems that allocate more blocks for

	 * the bitmaps than needed.  We simply ignore that, but verify it didn't

	 * create one with not enough blocks and bail out if so.

	 */

	block = minix_blocks_needed(sbi->s_ninodes, s->s_blocksize);

	if (sbi->s_imap_blocks < block) {

		printk("MINIX-fs: file system does not have enough "

				"imap blocks allocated.  Refusing to mount.\n");

		goto out_no_bitmap;

	}



	block = minix_blocks_needed(

			(sbi->s_nzones - sbi->s_firstdatazone + 1),

			s->s_blocksize);

	if (sbi->s_zmap_blocks < block) {

		printk("MINIX-fs: file system does not have enough "

				"zmap blocks allocated.  Refusing to mount.\n");

		goto out_no_bitmap;

	}



	/* set up enough so that it can read an inode */

	s->s_op = &minix_sops;

	s->s_time_min = 0;