diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-02 15:24:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-02 15:24:36 -0700 |
| commit | 569bede0cff5e98c0f862d486406b79dcada8eea (patch) | |
| tree | 9acb37598e0bc339dc3746f03b82151bd977903a /fs | |
| parent | Merge tag 'integrity-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity (diff) | |
| parent | fs-verity: mention btrfs support (diff) | |
| download | linux-dev-569bede0cff5e98c0f862d486406b79dcada8eea.tar.xz linux-dev-569bede0cff5e98c0f862d486406b79dcada8eea.zip | |
Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fsverity update from Eric Biggers:
"Just a small documentation update to mention the btrfs support"
* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fs-verity: mention btrfs support
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/verity/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/verity/Kconfig b/fs/verity/Kconfig index 54598cd80145..aad1f1d998b9 100644 --- a/fs/verity/Kconfig +++ b/fs/verity/Kconfig @@ -14,11 +14,11 @@ config FS_VERITY help This option enables fs-verity. fs-verity is the dm-verity mechanism implemented at the file level. On supported - filesystems (currently EXT4 and F2FS), userspace can use an - ioctl to enable verity for a file, which causes the filesystem - to build a Merkle tree for the file. The filesystem will then - transparently verify any data read from the file against the - Merkle tree. The file is also made read-only. + filesystems (currently ext4, f2fs, and btrfs), userspace can + use an ioctl to enable verity for a file, which causes the + filesystem to build a Merkle tree for the file. The filesystem + will then transparently verify any data read from the file + against the Merkle tree. The file is also made read-only. This serves as an integrity check, but the availability of the Merkle tree root hash also allows efficiently supporting |