[PATCH v2 3/3] integrity: Report error code in integrity_audit_message() call sites
Frederick Lawler
fred at cloudflare.com
Mon Jul 27 22:21:49 UTC 2026
Most IMA functions return a error code reported with a log message, or
depend on a error code from a callee in prior code paths. When inspecting
audit logs, it's not always clear a message was produced in the first
place because the cause may not expose the underlying reason. Since
integrity_audit_message() can take a error code, expose these where
it makes sense.
Signed-off-by: Frederick Lawler <fred at cloudflare.com>
---
security/integrity/evm/evm_main.c | 8 ++++----
security/integrity/ima/ima_api.c | 8 ++++----
security/integrity/ima/ima_appraise.c | 6 +++---
security/integrity/ima/ima_fs.c | 2 +-
security/integrity/ima/ima_init.c | 2 +-
security/integrity/ima/ima_main.c | 6 +++---
security/integrity/ima/ima_policy.c | 10 +++++-----
security/integrity/ima/ima_queue.c | 2 +-
security/integrity/ima/ima_template_lib.c | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index a32c98089b055fcf84f1a33dd016a51f57693d36..ba5c0dc4a8c131165aee688be68b27462489bd12 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -563,7 +563,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap,
dentry->d_inode, dentry->d_name.name,
"update_metadata",
integrity_status_msg[evm_status],
- -EPERM, 0, 0);
+ -EPERM, 0, -EPERM);
}
out:
/* Exception if the HMAC is not going to be calculated. */
@@ -590,7 +590,7 @@ static int evm_protect_xattr(struct mnt_idmap *idmap,
dentry->d_name.name,
"appraise_metadata",
integrity_status_msg[evm_status],
- -EPERM, 0, 0);
+ -EPERM, 0, -EPERM);
return evm_status == INTEGRITY_PASS ? 0 : -EPERM;
}
@@ -733,7 +733,7 @@ static int evm_inode_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
dentry->d_name.name,
"appraise_metadata",
integrity_status_msg[evm_status],
- -EPERM, 0, 0);
+ -EPERM, 0, -EPERM);
return -EPERM;
}
@@ -998,7 +998,7 @@ static int evm_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
d_backing_inode(dentry), dentry->d_name.name,
"appraise_metadata",
integrity_status_msg[evm_status], -EPERM, 0,
- 0);
+ -EPERM);
return -EPERM;
}
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 8c37dd4c9bb805213fb62e597a70189eca12b897..1c40fea4b9a7d990ffe2c1a5ce54cec94f9cb7ef 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -116,7 +116,7 @@ int ima_store_template(struct ima_template_entry *entry,
if (result < 0) {
integrity_audit_message(AUDIT_INTEGRITY_PCR, inode,
template_name, op, audit_cause,
- result, 0, 0);
+ result, 0, result);
return result;
}
}
@@ -159,7 +159,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
ima_free_template_entry(entry);
err_out:
integrity_audit_message(AUDIT_INTEGRITY_PCR, inode, filename, op,
- cause, result, 0, 0);
+ cause, result, 0, result);
}
/**
@@ -330,7 +330,7 @@ int ima_collect_measurement(struct ima_iint_cache *iint, struct file *file,
integrity_audit_message(AUDIT_INTEGRITY_DATA, inode,
filename.name.name, "collect_data",
- audit_cause, result, 0, 0);
+ audit_cause, result, 0, result);
release_dentry_name_snapshot(&filename);
}
@@ -383,7 +383,7 @@ void ima_store_measurement(struct ima_iint_cache *iint, struct file *file,
result = ima_alloc_init_template(&event_data, &entry, template_desc);
if (result < 0) {
integrity_audit_message(AUDIT_INTEGRITY_PCR, inode, filename,
- op, audit_cause, result, 0, 0);
+ op, audit_cause, result, 0, result);
return;
}
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index cc88e3add5b7028d4901e284ef920b324645e719..6c9c1e04669a700c0558639a6f06bd759de60aef 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -559,7 +559,7 @@ int ima_appraise_measurement(enum ima_hooks func, struct ima_iint_cache *iint,
status = INTEGRITY_FAIL;
cause = "unverifiable-signature";
integrity_audit_message(audit_msgno, inode, filename,
- op, cause, rc, 0, 0);
+ op, cause, rc, 0, rc);
} else if (status != INTEGRITY_PASS) {
/* Fix mode, but don't replace file signatures. */
if ((ima_appraise & IMA_APPRAISE_FIX) && !try_modsig &&
@@ -584,7 +584,7 @@ int ima_appraise_measurement(enum ima_hooks func, struct ima_iint_cache *iint,
}
integrity_audit_message(audit_msgno, inode, filename,
- op, cause, rc, 0, 0);
+ op, cause, rc, 0, rc);
} else {
ima_cache_flags(iint, func);
}
@@ -745,7 +745,7 @@ static int validate_hash_algo(struct dentry *dentry,
path = dentry_path(dentry, pathbuf, PATH_MAX);
integrity_audit_message(AUDIT_INTEGRITY_DATA, d_inode(dentry), path,
- "set_data", errmsg, -EACCES, 0, 0);
+ "set_data", errmsg, -EACCES, 0, -EACCES);
kfree(pathbuf);
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index a0c1a6dd6a750220b529cc3f77c2ae5673188e11..deadc946af641811928b7e65d53de3515126e85a 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -596,7 +596,7 @@ static ssize_t ima_write_policy(struct file *file, const char __user *buf,
integrity_audit_message(AUDIT_INTEGRITY_STATUS, NULL, NULL,
"policy_update",
"signed policy required",
- result, 0, 0);
+ result, 0, result);
result = -EACCES;
} else {
ima_measure_raw_policy(data, datalen);
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index def350f7d6a0c58f119f2c74f26ea365471fb1c7..ca53a19911dab46b7bfd34fba2fc1380da872b14 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -103,7 +103,7 @@ static int __init ima_add_boot_aggregate(void)
return 0;
err_out:
integrity_audit_message(AUDIT_INTEGRITY_PCR, NULL, filename, op,
- audit_cause, result, 0, 0);
+ audit_cause, result, 0, result);
return result;
}
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 22d649fa19b334674b8e81dd537033cebf569699..1d2a2ab2ff89e92f34b58e4b7c651f1d21daf7e2 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -120,7 +120,7 @@ static int mmap_violation_check(enum ima_hooks func, struct file *file,
filename);
integrity_audit_message(AUDIT_INTEGRITY_DATA, inode, *pathname,
"mmap_file", "mmapped_writers", rc, 0,
- 0);
+ rc);
}
return rc;
}
@@ -467,7 +467,7 @@ static int process_measurement(struct file *file, const struct cred *cred,
integrity_audit_message(AUDIT_INTEGRITY_DATA, file_inode(file),
pathname, "collect_data",
- "denied-hash-algorithm", rc, 0, 0);
+ "denied-hash-algorithm", rc, 0, rc);
}
out_locked:
if ((mask & MAY_WRITE) && test_bit(IMA_DIGSIG, &iint->atomic_flags) &&
@@ -581,7 +581,7 @@ static int ima_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
pathname = ima_d_path(&file->f_path, &pathbuf, filename);
integrity_audit_message(AUDIT_INTEGRITY_DATA, inode, pathname,
"collect_data", "failed-mprotect", result, 0,
- 0);
+ result);
if (pathbuf)
__putname(pathbuf);
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 4f0ebc02de4eb4cf48633f3e87362a20ece3a689..3961f0b99d0672efdb4cd225ab86a54c2a75df5b 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -1988,7 +1988,7 @@ ssize_t ima_parse_add_rule(char *rule)
if (!entry) {
integrity_audit_message(AUDIT_INTEGRITY_STATUS, NULL,
NULL, op, "-ENOMEM", -ENOMEM,
- audit_info, 0);
+ audit_info, -ENOMEM);
return -ENOMEM;
}
@@ -1999,7 +1999,7 @@ ssize_t ima_parse_add_rule(char *rule)
ima_free_rule(entry);
integrity_audit_message(AUDIT_INTEGRITY_STATUS, NULL,
NULL, op, "invalid-policy", result,
- audit_info, 0);
+ audit_info, result);
return result;
}
@@ -2417,7 +2417,7 @@ void ima_measure_loaded_policy(void)
rule = kmalloc(rule_len, GFP_KERNEL);
if (!rule) {
integrity_audit_message(AUDIT_INTEGRITY_PCR, NULL, event_name,
- op, "ENOMEM", result, 0, 0);
+ op, "ENOMEM", result, 0, result);
return;
}
@@ -2436,7 +2436,7 @@ void ima_measure_loaded_policy(void)
result = -E2BIG;
integrity_audit_message(AUDIT_INTEGRITY_PCR, NULL,
event_name, op, "rule_length",
- result, 0, 0);
+ result, 0, result);
rcu_read_unlock();
goto free_rule;
}
@@ -2450,7 +2450,7 @@ void ima_measure_loaded_policy(void)
file.buf = kmalloc(file_len, GFP_KERNEL);
if (!file.buf) {
integrity_audit_message(AUDIT_INTEGRITY_PCR, NULL, event_name,
- op, "ENOMEM", result, 0, 0);
+ op, "ENOMEM", result, 0, result);
goto free_rule;
}
diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
index e7b4df6b2ca299c38976012ac6eaaffcc5100e51..3b898930dea66ae6362160d0b47a320e16453280 100644
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -292,7 +292,7 @@ int ima_add_template_entry(struct ima_template_entry *entry, int violation,
out:
mutex_unlock(&ima_extend_list_mutex);
integrity_audit_message(AUDIT_INTEGRITY_PCR, inode, filename, op,
- audit_cause, result, audit_info, 0);
+ audit_cause, result, audit_info, result);
return result;
}
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
index c87dcbe67820266149da6ad7d4f2f7061ff3c5c1..6d163312fb4c47ce256766e997aac5f7375088a8 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -392,7 +392,7 @@ int ima_eventdigest_init(struct ima_event_data *event_data,
if (result) {
integrity_audit_message(AUDIT_INTEGRITY_DATA, inode,
event_data->filename, "collect_data",
- "failed", result, 0, 0);
+ "failed", result, 0, result);
return result;
}
cur_digest = hash_hdr->digest;
--
2.43.0
More information about the Linux-security-module-archive
mailing list