From 0b0b81357537035e82c3dbe2cecaa886f1ecb1d8 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Tue, 5 May 2009 13:13:00 -0400 Subject: [PATCH] --- yaml --- r: 146419 b: refs/heads/master c: e5e520a715dcea6b72f6b9417b203a4b1e813a8b h: refs/heads/master i: 146417: fea9f8ec4266eb461b8ae2956c08a2dd4ed1b037 146415: 7c5f48eca7fc423c1194aef4fcfef66d8a3f8f30 v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_audit.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 86102c268139..09f2b731f69e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53fc0e2259f261602a2750dcc82b8d7bf04d3c35 +refs/heads/master: e5e520a715dcea6b72f6b9417b203a4b1e813a8b diff --git a/trunk/security/integrity/ima/ima_audit.c b/trunk/security/integrity/ima/ima_audit.c index 1e082bb987be..c1461150691c 100644 --- a/trunk/security/integrity/ima/ima_audit.c +++ b/trunk/security/integrity/ima/ima_audit.c @@ -54,19 +54,10 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode, audit_get_loginuid(current), audit_get_sessionid(current)); audit_log_task_context(ab); - switch (audit_msgno) { - case AUDIT_INTEGRITY_DATA: - case AUDIT_INTEGRITY_METADATA: - case AUDIT_INTEGRITY_PCR: - case AUDIT_INTEGRITY_STATUS: - audit_log_format(ab, " op=%s cause=%s", op, cause); - break; - case AUDIT_INTEGRITY_HASH: - audit_log_format(ab, " op=%s hash=%s", op, cause); - break; - default: - audit_log_format(ab, " op=%s", op); - } + audit_log_format(ab, " op="); + audit_log_string(ab, op); + audit_log_format(ab, " cause="); + audit_log_string(ab, cause); audit_log_format(ab, " comm="); audit_log_untrustedstring(ab, current->comm); if (fname) {