[PATCH 0/2] btrfs-progs: check/lowmem: fix false alerts about verity items

[PATCH 0/2] btrfs-progs: check/lowmem: fix false alerts about verity items

[Qu Wenruo]

Leo reported and fixed a bug in original mode where false alerts were
triggered about verity items.

Unfortunately we have a similar problem in lowmem mode too.

Fix the lowmem mode false alert and add a test case to prevent similar
problems in the future.

Qu Wenruo (2):
  btrfs-progs: check/lowmem: recognize verity item keys
  btrfs-progs: fsck-tests: add a test case for verity items

 check/mode-lowmem.c                              |   3 +++
 .../fsck-tests/072-verity-items/fsverity.img.xz  | Bin 0 -> 2364 bytes
 tests/fsck-tests/072-verity-items/test.sh        |  15 +++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 tests/fsck-tests/072-verity-items/fsverity.img.xz
 create mode 100755 tests/fsck-tests/072-verity-items/test.sh

--
2.53.0

[PATCH 1/2] btrfs-progs: check/lowmem: recognize verity item keys

[Qu Wenruo]

Commit 4e88bb6e ("btrfs-progs: enhance detection on unknown inode keys")
added stricter validation for inode keys in the lowmem mode checker,
flagging unknown key types as errors. However, it did not add cases for
BTRFS_VERITY_DESC_ITEM_KEY (36) and BTRFS_VERITY_MERKLE_ITEM_KEY (37),
causing any filesystem with fs-verity enabled files to fail the lowmem
mode check with the following error:

 [5/8] checking fs roots
 ERROR: ITEM[257 36 0] UNKNOWN TYPE in leaf 30490624
 ERROR: ITEM[257 36 1] UNKNOWN TYPE in leaf 30490624
 ERROR: ITEM[257 37 0] UNKNOWN TYPE in leaf 30490624
 ERROR: ITEM[257 37 2048] UNKNOWN TYPE in leaf 30490624
 ERROR: errors found in fs roots

Add the missing switch cases so that verity metadata items are
recognized and silently skipped during the lowmem check.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 check/mode-lowmem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 4375b92a5d12..5f41cda965a4 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -2817,7 +2817,10 @@ static int check_inode_item(struct btrfs_root *root, struct btrfs_path *path)
 			err |= ret;
 			break;
 		case BTRFS_XATTR_ITEM_KEY:
+		case BTRFS_VERITY_DESC_ITEM_KEY:
+		case BTRFS_VERITY_MERKLE_ITEM_KEY:
 			break;
+
 		default:
 			error("ITEM[%llu %u %llu] UNKNOWN TYPE in leaf %llu",
 			      key.objectid, key.type, key.offset, node->start);
-- 
2.53.0

[PATCH 2/2] btrfs-progs: fsck-tests: add a test case for verity items

[Qu Wenruo]

Leo recently fixed a false alerts in btrfs-check where verity items are
reported as unknown items.

Add a test case for such case, the image is generated by enabling
fsverity on a small file, which will have VERITY_DESC_ITEM and
VERITY_MERKLE_ITEM items to trigger the previous false alerts.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 .../fsck-tests/072-verity-items/fsverity.img.xz  | Bin 0 -> 2364 bytes
 tests/fsck-tests/072-verity-items/test.sh        |  15 +++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/fsck-tests/072-verity-items/fsverity.img.xz
 create mode 100755 tests/fsck-tests/072-verity-items/test.sh

diff --git a/tests/fsck-tests/072-verity-items/fsverity.img.xz b/tests/fsck-tests/072-verity-items/fsverity.img.xz
new file mode 100644
index 0000000000000000000000000000000000000000..eba1bbb4192e28820d86f4bf2fe13ba1a2ee3edd
GIT binary patch
literal 2364
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

literal 0
HcmV?d00001

diff --git a/tests/fsck-tests/072-verity-items/test.sh b/tests/fsck-tests/072-verity-items/test.sh
new file mode 100755
index 000000000000..d5dc08a09afa
--- /dev/null
+++ b/tests/fsck-tests/072-verity-items/test.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Verify that check can handle btrfs with fsverity features properly
+
+source "$TEST_TOP/common" || exit
+
+check_prereq btrfs
+
+check_image() {
+	# The image contains verity data in the fs tree.
+	# The check should not report verity items as errors.
+	run_check "$TOP/btrfs" check "$1"
+}
+
+check_all_images
-- 
2.53.0