From: Boris Burkov <boris@bur.io>
To: fstests@vger.kernel.org, linux-fscrypt@vger.kernel.org,
linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v13 1/5] common/verity: require corruption functionality
Date: Tue, 19 Jul 2022 17:49:46 -0700 [thread overview]
Message-ID: <f3b3ac5435afd912e47f867e6561c5cc3732f56e.1658277755.git.boris@bur.io> (raw)
In-Reply-To: <cover.1658277755.git.boris@bur.io>
Corrupting ext4 and f2fs relies on xfs_io fiemap. Btrfs corruption
testing will rely on a btrfs specific corruption utility. Add the
ability to require corruption functionality to make this properly
modular. To start, just check for fiemap, as that is needed
universally for _fsv_scratch_corrupt_bytes.
Signed-off-by: Boris Burkov <boris@bur.io>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
---
common/verity | 6 ++++++
tests/generic/574 | 1 +
tests/generic/576 | 1 +
3 files changed, 8 insertions(+)
diff --git a/common/verity b/common/verity
index 38eea157..d58cad90 100644
--- a/common/verity
+++ b/common/verity
@@ -141,6 +141,12 @@ _require_fsverity_dump_metadata()
_fail "Unexpected output from 'fsverity dump_metadata': $(<"$tmpfile")"
}
+# Check for userspace tools needed to corrupt verity data or metadata.
+_require_fsverity_corruption()
+{
+ _require_xfs_io_command "fiemap"
+}
+
_scratch_mkfs_verity()
{
case $FSTYP in
diff --git a/tests/generic/574 b/tests/generic/574
index 882baa21..17fdea52 100755
--- a/tests/generic/574
+++ b/tests/generic/574
@@ -28,6 +28,7 @@ _cleanup()
_supported_fs generic
_require_scratch_verity
_disable_fsverity_signatures
+_require_fsverity_corruption
_scratch_mkfs_verity &>> $seqres.full
_scratch_mount
diff --git a/tests/generic/576 b/tests/generic/576
index 3ef04953..c8862de2 100755
--- a/tests/generic/576
+++ b/tests/generic/576
@@ -28,6 +28,7 @@ _supported_fs generic
_require_scratch_verity
_require_scratch_encryption
_require_command "$KEYCTL_PROG" keyctl
+_require_fsverity_corruption
_disable_fsverity_signatures
_scratch_mkfs_encrypted_verity &>> $seqres.full
--
2.37.1
next prev parent reply other threads:[~2022-07-20 0:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 0:49 [PATCH v13 0/5] tests for btrfs fsverity Boris Burkov
2022-07-20 0:49 ` Boris Burkov [this message]
2022-07-20 0:49 ` [PATCH v13 2/5] common/verity: support btrfs in generic fsverity tests Boris Burkov
2022-07-25 18:41 ` Eric Biggers
2022-07-20 0:49 ` [PATCH v13 3/5] btrfs: test btrfs specific fsverity corruption Boris Burkov
2022-07-20 0:49 ` [PATCH v13 4/5] btrfs: test verity orphans with dmlogwrites Boris Burkov
2022-07-20 14:30 ` Sweet Tea Dorminy
2022-07-20 0:49 ` [PATCH v13 5/5] generic: test fs-verity EFBIG scenarios Boris Burkov
2022-07-20 14:13 ` [PATCH v13 0/5] tests for btrfs fsverity Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f3b3ac5435afd912e47f867e6561c5cc3732f56e.1658277755.git.boris@bur.io \
--to=boris@bur.io \
--cc=fstests@vger.kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).