Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5fb09fa authored by Andries Brouwer's avatar Andries Brouwer Committed by Linus Torvalds
Browse files

[PATCH] Fix for minix crash 



Mounting a (corrupt) minix filesystem with zero s_zmap_blocks
gives a spectacular crash on my 2.6.17.8 system, no doubt
because minix/inode.c does an unconditional
	minix_set_bit(0,sbi->s_zmap[0]->b_data);

[akpm@osdl.org: make labels conistent while we're there]

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb8d81e4

fs/minix/inode.c

+10 −3
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 
	/*

	 * Allocate the buffer map to keep the superblock small.

	 */

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

		goto out_illegal_sb;

	i = (sbi->s_imap_blocks + sbi->s_zmap_blocks) * sizeof(bh);

	map = kmalloc(i, GFP_KERNEL);

	if (!map)
@@ -276,6 +278,11 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 
		printk("MINIX-fs: can't allocate map\n");

	goto out_release;



out_illegal_sb:

	if (!silent)

		printk("MINIX-fs: bad superblock\n");

	goto out_release;



out_no_fs:

	if (!silent)

		printk("VFS: Can't find a Minix or Minix V2 filesystem "