Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d26c222 authored by Sarthak Kukreti's avatar Sarthak Kukreti Committed by Greg Kroah-Hartman
Browse files

block: Don't invalidate pagecache for invalid falloc modes 



commit 1364a3c391aedfeb32aa025303ead3d7c91cdf9d upstream.

Only call truncate_bdev_range() if the fallocate mode is supported. This
fixes a bug where data in the pagecache could be invalidated if the
fallocate() was called on the block device with an invalid mode.

Fixes: 25f4c414 ("block: implement (some of) fallocate for block devices")
Cc: stable@vger.kernel.org
Reported-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarSarthak Kukreti <sarthakkukreti@chromium.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Fixes: line?  I've never seen those wrapped.
Link: https://lore.kernel.org/r/20231011201230.750105-1-sarthakkukreti@chromium.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSarthak Kukreti <sarthakkukreti@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e2a0361

fs/block_dev.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -2041,21 +2041,26 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
	if ((start | len) & (bdev_logical_block_size(bdev) - 1))

	if ((start | len) & (bdev_logical_block_size(bdev) - 1))

		return -EINVAL;

		return -EINVAL;





	/* Invalidate the page cache, including dirty pages. */

	/*

	 * Invalidate the page cache, including dirty pages, for valid

	 * de-allocate mode calls to fallocate().

	 */

	mapping = bdev->bd_inode->i_mapping;

	mapping = bdev->bd_inode->i_mapping;

	truncate_inode_pages_range(mapping, start, end);





	switch (mode) {

	switch (mode) {

	case FALLOC_FL_ZERO_RANGE:

	case FALLOC_FL_ZERO_RANGE:

	case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:

	case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:

		truncate_inode_pages_range(mapping, start, end);

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

					    GFP_KERNEL, BLKDEV_ZERO_NOUNMAP);

					    GFP_KERNEL, BLKDEV_ZERO_NOUNMAP);

		break;

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:

		truncate_inode_pages_range(mapping, start, end);

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

					     GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK);

					     GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK);

		break;

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE:

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE:

		truncate_inode_pages_range(mapping, start, end);

		error = blkdev_issue_discard(bdev, start >> 9, len >> 9,

		error = blkdev_issue_discard(bdev, start >> 9, len >> 9,

					     GFP_KERNEL, 0);

					     GFP_KERNEL, 0);

		break;

		break;