Attachment #248551 for bug #264450




		} else if (fs->fs_magic == FS_UFS1_MAGIC) {
			FCHK(fs->fs_sblockloc, <, 0, %jd);
			FCHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd);
			FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd);
		}
		FCHK(fs->fs_frag, <, 1, %jd);
		FCHK(fs->fs_frag, >, MAXFRAG, %jd);

		WCHK(fs->fs_old_rotdelay, !=, 0, %jd);
		WCHK(fs->fs_old_rps, !=, 60, %jd);
		WCHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd);
		FCHK(fs->fs_old_cpg, !=, 1, %jd);
		WCHK(fs->fs_old_interleave, !=, 1, %jd);
		WCHK(fs->fs_old_trackskew, !=, 0, %jd);
		WCHK(fs->fs_old_cpc, !=, 0, %jd);
		WCHK(fs->fs_old_postblformat, !=, 1, %jd);
		FCHK(fs->fs_old_nrpos, !=, 1, %jd);
		WCHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd);
		WCHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd);
		WCHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd);
		FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd);
	} else {
		/* Bad magic number, so assume not a superblock */
		return (ENOENT);

Return to bug 264450

Lines 395-401 validate_sblock(struct fs *fs, int flags) Link Here

(-)b/sys/ufs/ffs/ffs_subr.c (-4 lines)
395	} else if (fs->fs_magic == FS_UFS1_MAGIC) {	395	} else if (fs->fs_magic == FS_UFS1_MAGIC) {
396	FCHK(fs->fs_sblockloc, <, 0, %jd);	396	FCHK(fs->fs_sblockloc, <, 0, %jd);
397	FCHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd);	397	FCHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd);
398	FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd);
399	}	398	}
400	FCHK(fs->fs_frag, <, 1, %jd);	399	FCHK(fs->fs_frag, <, 1, %jd);
401	FCHK(fs->fs_frag, >, MAXFRAG, %jd);	400	FCHK(fs->fs_frag, >, MAXFRAG, %jd);
Lines 472-487 validate_sblock(struct fs *fs, int flags) Link Here
472	WCHK(fs->fs_old_rotdelay, !=, 0, %jd);	471	WCHK(fs->fs_old_rotdelay, !=, 0, %jd);
473	WCHK(fs->fs_old_rps, !=, 60, %jd);	472	WCHK(fs->fs_old_rps, !=, 60, %jd);
474	WCHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd);	473	WCHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd);
475	FCHK(fs->fs_old_cpg, !=, 1, %jd);
476	WCHK(fs->fs_old_interleave, !=, 1, %jd);	474	WCHK(fs->fs_old_interleave, !=, 1, %jd);
477	WCHK(fs->fs_old_trackskew, !=, 0, %jd);	475	WCHK(fs->fs_old_trackskew, !=, 0, %jd);
478	WCHK(fs->fs_old_cpc, !=, 0, %jd);	476	WCHK(fs->fs_old_cpc, !=, 0, %jd);
479	WCHK(fs->fs_old_postblformat, !=, 1, %jd);	477	WCHK(fs->fs_old_postblformat, !=, 1, %jd);
480	FCHK(fs->fs_old_nrpos, !=, 1, %jd);	478	FCHK(fs->fs_old_nrpos, !=, 1, %jd);
481	WCHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd);
482	WCHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd);	479	WCHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd);
483	WCHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd);	480	WCHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd);
484	FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd);
485	} else {	481	} else {
486	/* Bad magic number, so assume not a superblock */	482	/* Bad magic number, so assume not a superblock */
487	return (ENOENT);	483	return (ENOENT);