From: Darrick J. Wong Date: Sun, 23 Aug 2015 23:21:01 +0000 (+1000) Subject: libxfs: readahead of dir3 data blocks should use the read verifier X-Git-Tag: v4.2.0-rc3~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06e61d624a793a0b9eaf60153410b8c0a63159a8;p=thirdparty%2Fxfsprogs-dev.git libxfs: readahead of dir3 data blocks should use the read verifier In the dir3 data block readahead function, use the regular read verifier to check the block's CRC and spot-check the block contents instead of calling the spot-checking routine directly. This prevents corrupted directory data blocks from being read into the kernel, which can lead to garbage ls output and directory loops (if say one of the entries contains invalid characters). Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c index c475ba888..0c9f529fb 100644 --- a/libxfs/xfs_dir2_data.c +++ b/libxfs/xfs_dir2_data.c @@ -250,7 +250,8 @@ xfs_dir3_data_reada_verify( return; case cpu_to_be32(XFS_DIR2_DATA_MAGIC): case cpu_to_be32(XFS_DIR3_DATA_MAGIC): - xfs_dir3_data_verify(bp); + bp->b_ops = &xfs_dir3_data_buf_ops; + bp->b_ops->verify_read(bp); return; default: xfs_buf_ioerror(bp, -EFSCORRUPTED);