Skip to content

xfstests: add tests for fscrypt key management improvements

Eric Biggers fstests linux-fscrypt 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 5 repliesIn review
  2. v29 patches 0 repliesSuperseded
  3. v1 RFC9 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- Updated "common/encrypt: disambiguate session encryption keys" to rename the new instance of _generate_encryption_key() in generic/576.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9common/encrypt: disambiguate session encryption keyscommon/encrypt tests/ext4/024 tests/generic/397 +8 more+34 -340 replies
2/9common/encrypt: add helper functions that wrap new xfs_io commandscommon/encrypt+65 -00 replies
3/9common/encrypt: support checking for v2 encryption policy supportcommon/encrypt+33 -90 replies
4/9common/encrypt: support verifying ciphertext of v2 encryption policiescommon/encrypt src/fscrypt-crypt-util.c+316 -460 replies
5/9generic: add basic test for fscrypt API additionstests/generic/800 tests/generic/800.out tests/generic/group+219 -00 replies
6/9generic: add test for non-root use of fscrypt API additionstests/generic/801 tests/generic/801.out tests/generic/group+207 -04 replies
7/9generic: verify ciphertext of v2 encryption policies with AES-256tests/generic/802 tests/generic/802.out tests/generic/group+50 -00 replies
8/9generic: verify ciphertext of v2 encryption policies with AES-128tests/generic/803 tests/generic/803.out tests/generic/group+50 -00 replies
9/9generic: verify ciphertext of v2 encryption policies with Adiantumtests/generic/804 tests/generic/804.out tests/generic/group+57 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/9] xfstests: add tests for fscrypt key management improvements

Hello,

This patchset adds xfstests for the new fscrypt functionality that was merged for 5.4 (https://git.kernel.org/torvalds/c/734d1ed83e1f9b7b),
namely the new ioctls for managing filesystem encryption keys and the new/updated ioctls for v2 encryption policy support. It also includes ciphertext verification tests for v2 encryption policies.

These tests require new xfs_io commands, which are present in the for-next branch of xfsprogs. They also need a kernel v5.4-rc1 or later. As is usual for xfstests, the tests will skip themselves if their prerequisites aren't met.

Note: currently only ext4, f2fs, and ubifs support encryption. But I was told previously that since the fscrypt API is generic and may be supported by XFS in the future, the command-line wrappers for the fscrypt ioctls should be in xfs_io rather than in xfstests directly
(https://marc.info/?l=fstests&m=147976255831951&w=2).

This patchset can also be retrieved from tag
"fscrypt-key-mgmt-improvements_2019-10-15" of
https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/xfstests-dev.git

Changes since v2:

- Updated "common/encrypt: disambiguate session encryption keys" to rename the new instance of _generate_encryption_key() in generic/576.

Changes since v1:

- Addressed comments from Eryu Guan regarding
_require_encryption_policy_support().

- In generic/801, handle the fsgqa user having part of their key quota already consumed before beginning the test, in order to avoid a false test failure on some systems.

Eric Biggers (9):
common/encrypt: disambiguate session encryption keys common/encrypt: add helper functions that wrap new xfs_io commands common/encrypt: support checking for v2 encryption policy support common/encrypt: support verifying ciphertext of v2 encryption policies
generic: add basic test for fscrypt API additions
generic: add test for non-root use of fscrypt API additions
generic: verify ciphertext of v2 encryption policies with AES-256
generic: verify ciphertext of v2 encryption policies with AES-128
generic: verify ciphertext of v2 encryption policies with Adiantum

 common/encrypt           | 181 +++++++++++++++++++----
 src/fscrypt-crypt-util.c | 304 ++++++++++++++++++++++++++++++++++-----
 tests/ext4/024           |   2 +-
 tests/generic/397        |   4 +-
 tests/generic/398        |   8 +-
 tests/generic/399        |   4 +-
 tests/generic/419        |   4 +-
 tests/generic/421        |   4 +-
 tests/generic/429        |   8 +-
 tests/generic/435        |   4 +-
 tests/generic/440        |   8 +-
 tests/generic/576        |   2 +-
 tests/generic/800        | 127 ++++++++++++++++
 tests/generic/800.out    |  91 ++++++++++++
 tests/generic/801        | 144 +++++++++++++++++++
 tests/generic/801.out    |  62 ++++++++
 tests/generic/802        |  43 ++++++
 tests/generic/802.out    |   6 +
 tests/generic/803        |  43 ++++++
 tests/generic/803.out    |   6 +
 tests/generic/804        |  45 ++++++
 tests/generic/804.out    |  11 ++
 tests/generic/group      |   5 +
 23 files changed, 1029 insertions(+), 87 deletions(-)
 create mode 100755 tests/generic/800
 create mode 100644 tests/generic/800.out
 create mode 100755 tests/generic/801
 create mode 100644 tests/generic/801.out
 create mode 100755 tests/generic/802
 create mode 100644 tests/generic/802.out
 create mode 100755 tests/generic/803
 create mode 100644 tests/generic/803.out
 create mode 100755 tests/generic/804
 create mode 100644 tests/generic/804.out
Signature · 1 line
2.23.0.700.g56cf767bdb-goog