e2fsck: handle verity files in scan_extent_node()

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.

Fixes: 3baafde6a8ae ("e2fsck: allow verity files to have initialized blocks past i_size")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 5c413610c74ff807a1b445b05fdaf04182460c63..524577ae93232ead6044300e44386cad4da74b41 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -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;