Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f5fb09fa3392ad43fbcfc2f4580752f383ab5996

Authored by Andries Brouwer
Committed by Linus Torvalds
1 parent fb8d81e477
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 10 additions and 3 deletions Side-by-side Diff

... ... @@ -204,6 +204,8 @@
204 204 /*
205 205 * Allocate the buffer map to keep the superblock small.
206 206 */
  207 + if (sbi->s_imap_blocks == 0 || sbi->s_zmap_blocks == 0)
  208 + goto out_illegal_sb;
207 209 i = (sbi->s_imap_blocks + sbi->s_zmap_blocks) * sizeof(bh);
208 210 map = kmalloc(i, GFP_KERNEL);
209 211 if (!map)
... ... @@ -263,7 +265,7 @@
263 265  
264 266 out_no_bitmap:
265 267 printk("MINIX-fs: bad superblock or unable to read bitmaps\n");
266   - out_freemap:
  268 +out_freemap:
267 269 for (i = 0; i < sbi->s_imap_blocks; i++)
268 270 brelse(sbi->s_imap[i]);
269 271 for (i = 0; i < sbi->s_zmap_blocks; i++)
270 272  
... ... @@ -276,11 +278,16 @@
276 278 printk("MINIX-fs: can't allocate map\n");
277 279 goto out_release;
278 280  
  281 +out_illegal_sb:
  282 + if (!silent)
  283 + printk("MINIX-fs: bad superblock\n");
  284 + goto out_release;
  285 +
279 286 out_no_fs:
280 287 if (!silent)
281 288 printk("VFS: Can't find a Minix or Minix V2 filesystem "
282 289 "on device %s\n", s->s_id);
283   - out_release:
  290 +out_release:
284 291 brelse(bh);
285 292 goto out;
286 293  
... ... @@ -290,7 +297,7 @@
290 297  
291 298 out_bad_sb:
292 299 printk("MINIX-fs: unable to read superblock\n");
293   - out:
  300 +out:
294 301 s->s_fs_info = NULL;
295 302 kfree(sbi);
296 303 return -EINVAL;