diff options
| -rw-r--r-- | sbin/fsck_ffs/pass1.c | 9 | ||||
| -rw-r--r-- | sbin/fsck_ffs/setup.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index e6bd215..2772ec1 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -183,7 +183,8 @@ checkinode(inumber, idesc) { register struct dinode *dp; struct zlncnt *zlnp; - int ndb, j; + u_int64_t kernmaxfilesize; + ufs_daddr_t ndb, j; mode_t mode; char *symbuf; @@ -206,8 +207,10 @@ checkinode(inumber, idesc) return; } lastino = inumber; - if (/* dp->di_size < 0 || */ - dp->di_size + sblock.fs_bsize - 1 < dp->di_size || + /* This should match the file size limit in ffs_mountfs(). */ + kernmaxfilesize = (u_int64_t)0x40000000 * sblock.fs_bsize - 1; + if (dp->di_size > kernmaxfilesize || + dp->di_size > sblock.fs_maxfilesize || (mode == IFDIR && dp->di_size > MAXDIRSIZE)) { if (debug) printf("bad size %qu:", dp->di_size); diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 0c2e8ac..24000be 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -205,6 +205,8 @@ setup(dev) } else { sblock.fs_qbmask = ~sblock.fs_bmask; sblock.fs_qfmask = ~sblock.fs_fmask; + /* This should match the kernel limit in ffs_oldfscompat(). */ + sblock.fs_maxfilesize = (u_int64_t)1 << 39; newinofmt = 0; } /* |
