[PATCH v2 07/13] ima,evm: use d_real_metadata_inode()
From: Christian Brauner
Date: Mon Nov 16 2026 - 04:45:19 EST
d_real() is about to be able to fail. D_REAL_METADATA never has to look
anything up but we don't want to promise that it never fails. So switch
the open-coded d_inode(d_real(..., D_REAL_METADATA)) in
process_measurement() and evm_calc_hmac_or_hash() over to
d_real_metadata_inode() and deal with errors.
evm_calc_hmac_or_hash() returns the error so EVM fails to verify the
metadata. process_measurement() passes the error on to
evm_metadata_changed() which treats it like changed metadata and resets
the EVM status. That is needed as evm_verify_hmac() would otherwise hand
out a cached INTEGRITY_PASS without looking at the metadata again.
This is a no-op as long as overlayfs can't fail D_REAL_METADATA.
Suggested-by: Amir Goldstein <amir73il@xxxxxxxxx>
Link: https://lore.kernel.org/all/CAOQ4uxjoHbevvu8auB4m8AVcY9H6uHdDAP6mfi9OOMh+3775xA@xxxxxxxxxxxxxx
Signed-off-by: Christian Brauner (Amutable) <brauner@xxxxxxxxxx>
---
security/integrity/evm/evm_crypto.c | 5 ++++-
security/integrity/evm/evm_main.c | 9 +++++----
security/integrity/ima/ima_main.c | 6 +++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index 1c41af2f91a60..17d528771d8fe 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -231,7 +231,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
uint8_t type, struct evm_digest *data,
struct evm_iint_cache *iint)
{
- struct inode *inode = d_inode(d_real(dentry, D_REAL_METADATA));
+ struct inode *inode = d_real_metadata_inode(dentry);
struct xattr_list *xattr;
struct shash_desc *desc;
size_t xattr_size = 0;
@@ -241,6 +241,9 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
bool ima_present = false;
u64 i_version = 0;
+ if (IS_ERR(inode))
+ return PTR_ERR(inode);
+
if (!(inode->i_opflags & IOP_XATTR) ||
inode->i_sb->s_user_ns != &init_user_ns)
return -EOPNOTSUPP;
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index ac8328812e6ef..71faf156f9d6b 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -763,11 +763,11 @@ static void evm_reset_status(struct inode *inode)
/**
* evm_metadata_changed: Detect changes to the metadata
* @inode: a file's inode
- * @metadata_inode: metadata inode
+ * @metadata_inode: metadata inode, or an ERR_PTR() if it can't be resolved
*
* On a stacked filesystem detect whether the metadata has changed. If this is
- * the case reset the evm_status associated with the inode that represents the
- * file.
+ * the case, or if the metadata inode can't be resolved, reset the evm_status
+ * associated with the inode that represents the file.
*/
bool evm_metadata_changed(struct inode *inode, struct inode *metadata_inode)
{
@@ -775,7 +775,8 @@ bool evm_metadata_changed(struct inode *inode, struct inode *metadata_inode)
bool ret = false;
if (iint) {
- ret = (!IS_I_VERSION(metadata_inode) ||
+ ret = (IS_ERR(metadata_inode) ||
+ !IS_I_VERSION(metadata_inode) ||
integrity_inode_attrs_changed(&iint->metadata_inode,
metadata_inode));
if (ret)
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index e463cfc1e3f43..016de5a66eced 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -357,10 +357,10 @@ static int process_measurement(struct file *file, const struct cred *cred,
}
/*
- * Reset the EVM status when metadata changed.
+ * Reset the EVM status when metadata changed or the inode
+ * hosting it can't be resolved.
*/
- metadata_inode = d_inode(d_real(file_dentry(file),
- D_REAL_METADATA));
+ metadata_inode = d_real_metadata_inode(file_dentry(file));
if (evm_metadata_changed(inode, metadata_inode))
iint->flags &= ~(IMA_APPRAISED |
IMA_APPRAISED_SUBMASK);
--
2.53.0