summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-03-05 11:52:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-03-05 11:52:03 -0800
commit5ee8dbf54602dc340d6235b1d6aa17c0f283f48c (patch)
tree6edd1e11fbe3c4366d45e503d6a1fdb4ba822820
parent6a42ff33f38d171a6bf8304f6323c43e8a0ed9b6 (diff)
parenta300000233a9ff842e2fb450fb9a79f7827a586d (diff)
Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linuxHEADtorvalds/mastertorvalds/HEADmaster
Pull fsverity fix from Eric Biggers: "Prevent CONFIG_FS_VERITY from being enabled when the page size is 256K, since it doesn't work in that case" * tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux: fsverity: add dependency on 64K or smaller pages
-rw-r--r--fs/verity/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/verity/Kconfig b/fs/verity/Kconfig
index 76d1c5971b82..b20882963ffb 100644
--- a/fs/verity/Kconfig
+++ b/fs/verity/Kconfig
@@ -2,6 +2,9 @@
config FS_VERITY
bool "FS Verity (read-only file-based authenticity protection)"
+ # Filesystems cache the Merkle tree at a 64K aligned offset in the
+ # pagecache. That approach assumes the page size is at most 64K.
+ depends on PAGE_SHIFT <= 16
select CRYPTO_HASH_INFO
select CRYPTO_LIB_SHA256
select CRYPTO_LIB_SHA512