diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2015-08-19 10:33:58 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-19 10:33:58 +1000 |
| commit | 2f123bce18943fff819bc10f8868ffb9149fc622 (patch) | |
| tree | e568b49ec64c9230671833133da27405f76e111b | |
| parent | dbad7c993053d8f482a5f76270a93307537efd8e (diff) | |
| download | op-kernel-dev-2f123bce18943fff819bc10f8868ffb9149fc622.zip op-kernel-dev-2f123bce18943fff819bc10f8868ffb9149fc622.tar.gz | |
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 directly calling only the spot-checking routine. 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 slashes and other junk).
cc: <stable@vger.kernel.org> # 3.12 - 4.2
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c index 6a57fdb..824131e 100644 --- a/fs/xfs/libxfs/xfs_dir2_data.c +++ b/fs/xfs/libxfs/xfs_dir2_data.c @@ -252,7 +252,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); |
