e2fsck: handle verity files in scan_extent_node()
PATCH 1/1 e2fsck: handle verity files in scan_extent_node()
From: Eric Biggers <[email protected]>
Don't report PR_1_EXTENT_END_OUT_OF_BOUNDS on verity files during scan_extent_node(), since they will have blocks stored past i_size.
This was missed during the earlier fix because this check only triggers if the inode has enough extents to need at least one extent index node.
This bug is causing one of the fs-verity xfstests to fail with the reworked fs-verity patchset.
--- e2fsck/pass1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
e2fsck/pass1.c +3 -2
@@ -2812,8 +2812,9 @@ static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,else if (extent.e_lblk < start_block) problem =PR_1_OUT_OF_ORDER_EXTENTS ;else if ((end_block && last_lblk > end_block) && - (!(extent.e_flags &EXT2_EXTENT_FLAGS_UNINIT && - last_lblk > eof_block))) + !(last_lblk > eof_block && + ((extent.e_flags &EXT2_EXTENT_FLAGS_UNINIT ) || + (pctx->inode->i_flags &EXT4_VERITY_FL )))) problem =PR_1_EXTENT_END_OUT_OF_BOUNDS ;else if (is_leaf && extent.e_len ==0 ) problem =PR_1_EXTENT_LENGTH_ZERO ;
Signature · 1 line
2.21.0
Theodore Ts'o
AppliedQuoted 5 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Don't report
PR_1_EXTENT_END_OUT_OF_BOUNDSon verity files duringscan_extent_node(), since they will have blocks stored pasti_size.
Quoted 8 lines
This was missed during the earlier fix because this check only triggers if the inode has enough extents to need at least one extent index node.
This bug is causing one of the fs-verity xfstests to fail with the reworked fs-verity patchset.
Fixes 3baafde6a8ae ("e2fsck: allow verity files to have initialized blocks past i_size")Signed-off-by Eric Biggers <[email protected]>
Thanks, applied.
Could you supply a small (~200k) file system with a verity-protected file so we can add a regression test? Many thanks!!
- Ted