| Message ID | 20180524201105.3179904-3-stefanb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 24, 2018 at 4:10 PM, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > 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> > Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > --- > security/integrity/ima/ima_policy.c | 3 +-- > security/integrity/integrity_audit.c | 6 +----- > 2 files changed, 2 insertions(+), 7 deletions(-) Acked-by: Paul Moore <paul@paul-moore.com> > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index a823f11a3e6b..7297450b813c 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -615,8 +615,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 90987d15b6fe..db30763d5525 100644 > --- 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="); > -- > 2.13.6 > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index a823f11a3e6b..7297450b813c 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -615,8 +615,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 90987d15b6fe..db30763d5525 100644 --- 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=");