浏览代码

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>
Darrick J. Wong 10 年之前
父节点
当前提交
2f123bce18
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      fs/xfs/libxfs/xfs_dir2_data.c

+ 2 - 1
fs/xfs/libxfs/xfs_dir2_data.c

@@ -252,7 +252,8 @@ xfs_dir3_data_reada_verify(
 		return;
 		return;
 	case cpu_to_be32(XFS_DIR2_DATA_MAGIC):
 	case cpu_to_be32(XFS_DIR2_DATA_MAGIC):
 	case cpu_to_be32(XFS_DIR3_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;
 		return;
 	default:
 	default:
 		xfs_buf_ioerror(bp, -EFSCORRUPTED);
 		xfs_buf_ioerror(bp, -EFSCORRUPTED);