ima: Use audit_log_format() rather than audit_log_string()

Remove the usage of audit_log_string() and replace it with
audit_log_format().

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Suggested-by: Steve Grubb <sgrubb@redhat.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index f457684690039dd6ac8eda66c947bb7f6c1a1feb..50ead724ba23ed8cd69116659370397460cfee75 100644 (file)
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -663,8 +663,7 @@ static void ima_log_string_op(struct audit_buffer *ab, char *key, char *value,
                audit_log_format(ab, "%s<", key);
        else
                audit_log_format(ab, "%s=", key);
-       audit_log_string(ab, value);
-       audit_log_format(ab, " ");
+       audit_log_format(ab, "%s ", value);
 }
 static void ima_log_string(struct audit_buffer *ab, char *key, char *value)
 {

diff --git a/security/integrity/integrity_audit.c b/security/integrity/integrity_audit.c
index ab10a25310a19b9e125781eb52c7f62fb8fa8d90..82c98f7d217e80dbce90de4c4532f44a50d7dea9 100644 (file)
--- a/security/integrity/integrity_audit.c
+++ b/security/integrity/integrity_audit.c
@@ -45,11 +45,7 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,
                         from_kuid(&init_user_ns, audit_get_loginuid(current)),
                         audit_get_sessionid(current));
        audit_log_task_context(ab);
-       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_format(ab, " op=%s cause=%s comm=", op, cause);
        audit_log_untrustedstring(ab, get_task_comm(name, current));
        if (fname) {
                audit_log_format(ab, " name=");