Skip to contentSkip to conversation

FAILED: patch "[PATCH] libxfs: readahead of dir3 data blocks should use the read" failed to apply to 3.14-stable tree

PATCH [email protected] 1 participant 1 message Sep 16, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 2f123bce18943fff819bc10f8868ffb9149fc622 Mon Sep 17 00:00:00 2001

From: "Darrick J. Wong" <[email protected]>
Date: Wed, 19 Aug 2015 10:33:58 +1000
Subject: [PATCH] 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).

fs/xfs/libxfs/xfs_dir2_data.c +2 -1
index 6a57fdbc63ef..824131e71bc5 100644
@@ -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);