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
Unified · Split
| @@ -1354,7 +1354,7 @@ int ovl_ensure_verity_loaded(const struct path *datapath) · 1353 unmodified lines | |||
| 1354 | struct inode *inode = d_inode(datapath->dentry); | 1354 | struct inode *inode = d_inode(datapath->dentry); |
| 1355 | struct file *filp; | 1355 | struct file *filp; |
| 1356 | 1356 | ||
| 1357 | if (!fsverity_active(inode) && IS_VERITY(inode)) { | 1357 | if (IS_VERITY(inode) && fsverity_get_info(inode) == NULL) { |
| 1358 | /* | 1358 | /* |
| 1359 | * If this inode was not yet opened, the verity info hasn't been | 1359 | * If this inode was not yet opened, the verity info hasn't been |
| 1360 | * loaded yet, so we need to do that here to force it into memory. | 1360 | * loaded yet, so we need to do that here to force it into memory. |