* [PATCH] integrity: use audit_log_string
@ 2009-05-05 17:13 Mimi Zohar
2009-05-05 17:59 ` Eric Paris
0 siblings, 1 reply; 2+ messages in thread
From: Mimi Zohar @ 2009-05-05 17:13 UTC (permalink / raw)
To: linux-kernel; +Cc: Eric Paris, James Morris, david safford
Based on a request from Eric Paris to simplify parsing, replace
audit_log_format statements containing "%s" with audit_log_string().
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Index: security-testing-2.6/security/integrity/ima/ima_audit.c
===================================================================
--- security-testing-2.6.orig/security/integrity/ima/ima_audit.c
+++ security-testing-2.6/security/integrity/ima/ima_audit.c
@@ -54,19 +54,10 @@ void integrity_audit_msg(int audit_msgno
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) {
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] integrity: use audit_log_string
2009-05-05 17:13 [PATCH] integrity: use audit_log_string Mimi Zohar
@ 2009-05-05 17:59 ` Eric Paris
0 siblings, 0 replies; 2+ messages in thread
From: Eric Paris @ 2009-05-05 17:59 UTC (permalink / raw)
To: Mimi Zohar; +Cc: linux-kernel, James Morris, david safford
On Tue, 2009-05-05 at 13:13 -0400, Mimi Zohar wrote:
> Based on a request from Eric Paris to simplify parsing, replace
> audit_log_format statements containing "%s" with audit_log_string().
>
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
As long as you don't mind that change from hash= to cause= I'm ok with
it too:
Acked-by: Eric Paris <eparis@redhat.com>
>
> Index: security-testing-2.6/security/integrity/ima/ima_audit.c
> ===================================================================
> --- security-testing-2.6.orig/security/integrity/ima/ima_audit.c
> +++ security-testing-2.6/security/integrity/ima/ima_audit.c
> @@ -54,19 +54,10 @@ void integrity_audit_msg(int audit_msgno
> 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) {
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-05 18:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-05 17:13 [PATCH] integrity: use audit_log_string Mimi Zohar
2009-05-05 17:59 ` Eric Paris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®