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

1bfaee9d · Linus Torvalds <[email protected]> · 2026-05-09 11:47:39 -07:00

Pull fsverity fix from Eric Biggers:
 "Fix a regression in overlayfs caused by an fsverity API change"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux:
  ovl: fix verity lazy-load guard broken by fsverity_active() semantic change

Commit: 1bfaee9d3351b9b32a99766bbfb1f5baed60ddef
Parents: e92b2872 · 0c8c88b8

Merge commit. Changes below are compared with the first parent: e92b2872.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/overlayfs/util.c	modified	+1	−1	View file

fs/overlayfs/util.c

View file

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 7b86a6b..b41f478 100644
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -1354,7 +1354,7 @@ int ovl_ensure_verity_loaded(const struct path *datapath)
 	struct inode *inode = d_inode(datapath->dentry);
 	struct file *filp;
 
-	if (!fsverity_active(inode) && IS_VERITY(inode)) {
+	if (IS_VERITY(inode) && fsverity_get_info(inode) == NULL) {
 		/*
 		 * If this inode was not yet opened, the verity info hasn't been
 		 * loaded yet, so we need to do that here to force it into memory.