lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 23 May 2019 08:30:33 -0700 From: Eric Biggers <ebiggers@...nel.org> To: linux-ext4@...r.kernel.org Subject: [PATCH] e2fsck: handle verity files in scan_extent_node() From: Eric Biggers <ebiggers@...gle.com> 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@...gle.com> --- e2fsck/pass1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 5c413610..524577ae 100644 --- 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; -- 2.21.0
Powered by blists - more mailing lists