aboutsummaryrefslogtreecommitdiff
path: root/e2fsck
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2018-08-23 11:33:22 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-08-23 11:33:22 -0400
commitf56db533fc5be9a1398ae9ff67fc03837cc667ea (patch)
treebf707e76cf53f4ba17d3b2605a8ac07ad4f5719d /e2fsck
parent0e49172e83dfb0e8ded7e1756c5b3c6e64601fe3 (diff)
parentf2243f1bdcc3ce711157151805e7e78112bcd3bc (diff)
downloade2fsprogs-f56db533fc5be9a1398ae9ff67fc03837cc667ea.tar.gz
Merge branch 'maint' into next
Diffstat (limited to 'e2fsck')
-rw-r--r--e2fsck/pass1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index ce43821d..8abf0c33 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -3447,7 +3447,8 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
size = EXT2_I_SIZE(inode);
if ((pb.last_init_lblock >= 0) &&
/* Do not allow initialized allocated blocks past i_size*/
- (size < (__u64)pb.last_init_lblock * fs->blocksize))
+ (size < (__u64)pb.last_init_lblock * fs->blocksize) &&
+ !(inode->i_flags & EXT4_VERITY_FL))
bad_size = 3;
else if (!(extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) &&
size > ext2_max_sizes[fs->super->s_log_block_size])