diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 21:47:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 21:47:39 +0300 |
| commit | 1bfaee9d3351b9b32a99766bbfb1f5baed60ddef (patch) | |
| tree | e92981148ddf0c726e32e43de926d7a26ff4671f | |
| parent | e92b2872d0b198a77c0a438c5cdb1c5510762c1b (diff) | |
| parent | 0c8c88b8eb82a2a41bec5f17c076d6312dc40316 (diff) | |
| download | linux-1bfaee9d3351b9b32a99766bbfb1f5baed60ddef.tar.xz | |
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
| -rw-r--r-- | fs/overlayfs/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 7b86a6bac644..b41f4788e4f0 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. |