Commit 2c14f0ff authored May 31, 2023 by Christoph Hellwig Committed by David Sterba Jun 19, 2023

btrfs: fix fsverify read error handling in end_page_read



Also clear the uptodate bit to make sure the page isn't seen as uptodate
in the page cache if fsverity verification fails.

Fixes: 14605409 ("btrfs: initial fsverity support")
CC: stable@vger.kernel.org # 5.15+
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent ed9ee98e

fs/btrfs/extent_io.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -497,12 +497,8 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)
		ASSERT(page_offset(page) <= start &&
		start + len <= page_offset(page) + PAGE_SIZE);

		if (uptodate) {
		if (!btrfs_verify_page(page, start)) {
		btrfs_page_set_error(fs_info, page, start, len);
		} else {
		if (uptodate && btrfs_verify_page(page, start)) {
		btrfs_page_set_uptodate(fs_info, page, start, len);
		}
		} else {
		btrfs_page_clear_uptodate(fs_info, page, start, len);
		btrfs_page_set_error(fs_info, page, start, len);