Commit 5ee8dbf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux 

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
parents 6a42ff33 a3000002

fs/verity/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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