diff options
| author | Stefan Berger | 2018-06-04 22:54:54 +0200 |
|---|---|---|
| committer | Mimi Zohar | 2018-07-18 13:27:22 +0200 |
| commit | 2afd020aaeeefacb7711b47e3afb0cfb50db3f13 (patch) | |
| tree | bf3a9a541f8598092f8cd7ecbfa93c0f15bc0b22 /security/integrity/ima/ima_policy.c | |
| parent | ima: Use audit_log_format() rather than audit_log_string() (diff) | |
| download | kernel-qcow2-linux-2afd020aaeeefacb7711b47e3afb0cfb50db3f13.tar.gz kernel-qcow2-linux-2afd020aaeeefacb7711b47e3afb0cfb50db3f13.tar.xz kernel-qcow2-linux-2afd020aaeeefacb7711b47e3afb0cfb50db3f13.zip | |
ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set
If Integrity is not auditing, IMA shouldn't audit, either.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_policy.c')
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 50ead724ba23..0178bdaa40aa 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -657,6 +657,9 @@ static int ima_lsm_rule_init(struct ima_rule_entry *entry, static void ima_log_string_op(struct audit_buffer *ab, char *key, char *value, bool (*rule_operator)(kuid_t, kuid_t)) { + if (!ab) + return; + if (rule_operator == &uid_gt) audit_log_format(ab, "%s>", key); else if (rule_operator == &uid_lt) @@ -678,7 +681,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) bool uid_token; int result = 0; - ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_INTEGRITY_RULE); + ab = integrity_audit_log_start(NULL, GFP_KERNEL, + AUDIT_INTEGRITY_RULE); entry->uid = INVALID_UID; entry->fowner = INVALID_UID; |