patch-2.2.0-pre3 linux/fs/fat/inode.c

• Lines: 18
• Date: Fri Jan 1 12:19:45 1999
• Orig file: v2.2.0-pre2/linux/fs/fat/inode.c
• Orig date: Thu Dec 31 10:29:01 1998

diff -u --recursive --new-file v2.2.0-pre2/linux/fs/fat/inode.c linux/fs/fat/inode.c
@@ -364,11 +364,14 @@
 		MSDOS_SB(sb)->root_cluster = CF_LE_L(b->root_cluster);
 		MSDOS_SB(sb)->fsinfo_offset =
 			CF_LE_W(b->info_sector) * logical_sector_size + 0x1e0;
+		if (MSDOS_SB(sb)->fsinfo_offset + sizeof(MSDOS_SB(sb)->fsinfo_offset) >= sizeof(struct fat_boot_sector)) {
+			printk("fat_read_super: Bad fsinfo_offset\n");
+			fat_brelse(sb, bh);
+			goto out_invalid;
+		}
 		fsinfo = (struct fat_boot_fsinfo *)
 			&bh->b_data[MSDOS_SB(sb)->fsinfo_offset];
-		if ((MSDOS_SB(sb)->fsinfo_offset - sizeof(MSDOS_SB(sb)->fsinfo_offset) + 1)> bh->b_size) 
-		    	printk("fat_read_super: Bad fsinfo_offset\n");
-		else if (CF_LE_L(fsinfo->signature) != 0x61417272) {
+		if (CF_LE_L(fsinfo->signature) != 0x61417272) {
 			printk("fat_read_super: Did not find valid FSINFO "
 				"signature. Found 0x%x\n",
 				CF_LE_L(fsinfo->signature));