Page MenuHomeFreeBSD
Files F149428321

D38668.id118500.diff
No OneTemporary
Actions

D38668.id118500.diff
View Options

diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -347,6 +347,8 @@
#lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs, wmsg);\
if (error == 0) \
error = warnerr; \
+ if (warnerr == 0) \
+ lhs = rhs; \
}
#define FCHK2(lhs1, op1, rhs1, lhs2, op2, rhs2, fmt) \
if (lhs1 op1 rhs1 && lhs2 op2 rhs2) { \
@@ -360,16 +362,6 @@
if (error == 0) \
error = ENOENT; \
}
-#define WCHK2(lhs1, op1, rhs1, lhs2, op2, rhs2, fmt) \
- if (lhs1 op1 rhs1 && lhs2 op2 rhs2) { \
- MPRINT("UFS%d superblock failed: %s (" #fmt ") %s %s (" \
- #fmt ") && %s (" #fmt ") %s %s (" #fmt ")%s\n", \
- fs->fs_magic == FS_UFS1_MAGIC ? 1 : 2, #lhs1, \
- (intmax_t)lhs1, #op1, #rhs1, (intmax_t)rhs1, #lhs2, \
- (intmax_t)lhs2, #op2, #rhs2, (intmax_t)rhs2, wmsg); \
- if (error == 0) \
- error = warnerr; \
- }
static int
validate_sblock(struct fs *fs, int flags)
@@ -408,6 +400,7 @@
} 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);
@@ -431,6 +424,30 @@
FCHK(fs->fs_sblkno, !=, roundup(
howmany(fs->fs_sblockloc + SBLOCKSIZE, fs->fs_fsize),
fs->fs_frag), %jd);
+ FCHK(CGSIZE(fs), >, fs->fs_bsize, %jd);
+ /* Only need to validate these if reading in csum data */
+ if ((flags & UFS_NOCSUM) != 0)
+ return (error);
+ FCHK((u_int64_t)fs->fs_ipg * fs->fs_ncg, >,
+ (((int64_t)(1)) << 32) - INOPB(fs), %jd);
+ FCHK(fs->fs_cstotal.cs_nifree, <, 0, %jd);
+ FCHK(fs->fs_cstotal.cs_nifree, >,
+ (u_int64_t)fs->fs_ipg * fs->fs_ncg, %jd);
+ FCHK(fs->fs_cstotal.cs_ndir, >,
+ ((u_int64_t)fs->fs_ipg * fs->fs_ncg) -
+ fs->fs_cstotal.cs_nifree, %jd);
+ FCHK(fs->fs_size, <, 8 * fs->fs_frag, %jd);
+ FCHK(fs->fs_size, <=, ((int64_t)fs->fs_ncg - 1) * fs->fs_fpg,
+ %jd);
+ FCHK(fs->fs_size, >, (int64_t)fs->fs_ncg * fs->fs_fpg, %jd);
+ FCHK(fs->fs_csaddr, <, 0, %jd);
+ FCHK(fs->fs_cssize, !=,
+ fragroundup(fs, fs->fs_ncg * sizeof(struct csum)), %jd);
+ FCHK(dtog(fs, fs->fs_csaddr), >, fs->fs_ncg, %jd);
+ FCHK(fs->fs_csaddr, <, cgdmin(fs, dtog(fs, fs->fs_csaddr)),
+ %jd);
+ FCHK(dtog(fs, fs->fs_csaddr + howmany(fs->fs_cssize,
+ fs->fs_fsize)), >, dtog(fs, fs->fs_csaddr), %jd);
return (error);
}
if (fs->fs_magic == FS_UFS2_MAGIC) {
@@ -511,6 +528,7 @@
FCHK(fs->fs_old_cgoffset, <, 0, %jd);
FCHK2(fs->fs_old_cgoffset, >, 0, ~fs->fs_old_cgmask, <, 0, %jd);
FCHK(fs->fs_old_cgoffset * (~fs->fs_old_cgmask), >, fs->fs_fpg, %jd);
+ FCHK(CGSIZE(fs), >, fs->fs_bsize, %jd);
/*
* If anything has failed up to this point, it is usafe to proceed
* as checks below may divide by zero or make other fatal calculations.

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 25, 10:01 AM (3 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30315299
Default Alt Text
D38668.id118500.diff (2 KB)

Event Timeline