Commit 1bfaee9d 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:
 "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
parents e92b2872 0c8c88b8

fs/overlayfs/util.c

+1 −1
Original line number Diff line number Diff line
@@ -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.