]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
ovl: fix verity lazy-load guard broken by fsverity_active() semantic change
authorColin Walters <walters@verbum.org>
Tue, 5 May 2026 22:42:57 +0000 (15:42 -0700)
committerEric Biggers <ebiggers@kernel.org>
Wed, 6 May 2026 15:37:30 +0000 (08:37 -0700)
commit0c8c88b8eb82a2a41bec5f17c076d6312dc40316
tree13966312e522ce15c4ea29ebdd063ff5fa513278
parent7fd2df204f342fc17d1a0bfcd474b24232fb0f32
ovl: fix verity lazy-load guard broken by fsverity_active() semantic change

Commit f77f281b6118 ("fsverity: use a hashtable to find the
fsverity_info") made fsverity_active() check whether the inode has the
verity flag, rather than whether the inode's fsverity_info is loaded.
This broke ovl_ensure_verity_loaded(), which wants to load the
fsverity_info for any verity inodes that haven't had it loaded yet.

Therefore, to check that the fsverity_info hasn't yet been loaded, use
fsverity_get_info(inode) == NULL instead of !fsverity_active(inode).

Also, since fsverity_get_info() now involves a hash table lookup, put
the more lightweight IS_VERITY() flag check first.

Fixes: f77f281b6118 ("fsverity: use a hashtable to find the fsverity_info")
Cc: stable@vger.kernel.org
Link: https://github.com/bootc-dev/bootc/issues/2174
Signed-off-by: Colin Walters <walters@verbum.org>
Acked-by: Amir Goldstein <amir73il@gmail.com>
Link: https://patch.msgid.link/20260505224257.23213-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
fs/overlayfs/util.c