Skip to content

Commit 1bfaee9

Browse files
committed
Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux
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
2 parents e92b287 + 0c8c88b commit 1bfaee9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/overlayfs/util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ int ovl_ensure_verity_loaded(const struct path *datapath)
13541354
struct inode *inode = d_inode(datapath->dentry);
13551355
struct file *filp;
13561356

1357-
if (!fsverity_active(inode) && IS_VERITY(inode)) {
1357+
if (IS_VERITY(inode) && fsverity_get_info(inode) == NULL) {
13581358
/*
13591359
* If this inode was not yet opened, the verity info hasn't been
13601360
* loaded yet, so we need to do that here to force it into memory.

0 commit comments

Comments
 (0)