Skip to content

ovl: fix verity lazy-load guard broken by fsverity_active() semantic change #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vfsci-bot wants to merge 1 commit into
base: vfs.base.ci
Choose a base branch
from
Open

ovl: fix verity lazy-load guard broken by fsverity_active() semantic change #1322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fs/overlayfs/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,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)) {
/*
* 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.
Expand Down
Loading