vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

ChangeLog, pass1.c: 

pass1.c (check_blocks): Fix large file checking code so that files >
  	2GB are considered large files, and restrict directories from being >
  	2GB.
version.h:
  Update for WIP release.
bitmap-optimize
Theodore Ts'o 2001-01-18 02:34:03 +00:00
parent dc2ec525f5
commit a5c33f26db
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2fsck/ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-17 Theodore Ts'o <tytso@valinux.com>
* pass1.c (check_blocks): Fix large file checking code so that
files > 2GB are considered large files, and restrict
directories from being > 2GB.
2001-01-12 Theodore Ts'o <tytso@valinux.com> 2001-01-12 Theodore Ts'o <tytso@valinux.com>
* journal.c (e2fsck_journal_fix_unsupported_super): Remove unused * journal.c (e2fsck_journal_fix_unsupported_super): Remove unused

10
e2fsck/pass1.c
View File

@ -923,8 +923,9 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
} }
if (pb.is_dir) { if (pb.is_dir) {
int nblock = inode->i_size >> EXT2_BLOCK_SIZE_BITS(fs->super); int nblock = inode->i_size >> EXT2_BLOCK_SIZE_BITS(fs->super);
if ((nblock > (pb.last_block + 1)) || /* We don't let a directory become larger than 2GB */
((inode->i_size & (fs->blocksize-1)) != 0)) if (nblock > (pb.last_block + 1) ||
(inode->i_size & ((fs->blocksize-1) | 0x80000000UL)) != 0)
bad_size = 1; bad_size = 1;
else if (nblock < (pb.last_block + 1)) { else if (nblock < (pb.last_block + 1)) {
if (((pb.last_block + 1) - nblock) > if (((pb.last_block + 1) - nblock) >
@ -932,11 +933,12 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
bad_size = 2; bad_size = 2;
} }
} else { } else {
size = inode->i_size + ((__u64) inode->i_size_high << 32); size = inode->i_size | ((__u64) inode->i_size_high << 32);
if ((size < pb.last_block * fs->blocksize)) if ((size < pb.last_block * fs->blocksize))
bad_size = 3; bad_size = 3;
else if (size > ext2_max_sizes[fs->super->s_log_block_size]) else if (size > ext2_max_sizes[fs->super->s_log_block_size])
bad_size = 4; bad_size = 4;
/* FIXME: need to ensure pb.num_blocks < 2^32 */
} }
if (bad_size) { if (bad_size) {
pctx->num = (pb.last_block+1) * fs->blocksize; pctx->num = (pb.last_block+1) * fs->blocksize;
@ -948,7 +950,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
} }
pctx->num = 0; pctx->num = 0;
} }
if (!pb.is_dir && inode->i_size_high) if (!pb.is_dir && (inode->i_size_high || inode->i_size & 0x80000000UL))
ctx->large_files++; ctx->large_files++;
if (pb.num_blocks != inode->i_blocks) { if (pb.num_blocks != inode->i_blocks) {
pctx->num = pb.num_blocks; pctx->num = pb.num_blocks;

2
version.h
View File

@ -7,4 +7,4 @@
*/ */
#define E2FSPROGS_VERSION "1.20-WIP" #define E2FSPROGS_VERSION "1.20-WIP"
#define E2FSPROGS_DATE "03-Jan-2001" #define E2FSPROGS_DATE "17-Jan-2001"