diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-08-01 16:41:34 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-08-01 16:41:34 +0000 |
| commit | 8e8f6bff4be30b660aaa84e51d775660ae6c2e08 (patch) | |
| tree | 9d4b457d676e91652021626eab62109d578a0c39 /sys/ufs/ffs | |
| parent | 163ff7cc1df3bfd5884fd336d4097e265c62b1cf (diff) | |
Limit max file size based on PAGE_SIZE. Even though ffs can handle
files up to 16TB, we do limit the max file to 2^31 pages to prevent
overflow of a 32-bit unsigned int. The buffer cache has its own
checks but a little added paranoia never hurts. Adapted from a patch
in FreeBSD.
Diffstat (limited to 'sys/ufs/ffs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index e420dca2f6a..16514740e93 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.53 2002/04/23 18:54:12 espie Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.54 2002/08/01 16:41:33 millert Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -788,8 +788,15 @@ ffs_mountfs(devvp, mp, p) } #endif + /* + * XXX + * Limit max file size. Even though ffs can handle files up to 16TB, + * we do limit the max file to 2^31 pages to prevent overflow of + * a 32-bit unsigned int. The buffer cache has its own checks but + * a little added paranoia never hurts. + */ ump->um_savedmaxfilesize = fs->fs_maxfilesize; /* XXX */ - maxfilesize = (u_int64_t)0x80000000 * fs->fs_bsize - 1; /* XXX */ + maxfilesize = (u_int64_t)0x80000000 * MIN(PAGE_SIZE, fs->fs_bsize) - 1; if (fs->fs_maxfilesize > maxfilesize) /* XXX */ fs->fs_maxfilesize = maxfilesize; /* XXX */ if (ronly == 0) { |