From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754805AbZEESAv@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754805AbZEESAv (ORCPT <rfc822;w@1wt.eu>);
	Tue, 5 May 2009 14:00:51 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751439AbZEESAk
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 5 May 2009 14:00:40 -0400
Received: from mx2.redhat.com ([66.187.237.31]:35294 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751103AbZEESAj (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 5 May 2009 14:00:39 -0400
Subject: Re: [PATCH] integrity: use audit_log_string
From: Eric Paris <eparis@redhat.com>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org, James Morris <jmorris@namei.org>,
       david safford <safford@watson.ibm.com>
In-Reply-To: <1241543580.6101.11.camel@dyn9002018117.watson.ibm.com>
References: <1241543580.6101.11.camel@dyn9002018117.watson.ibm.com>
Content-Type: text/plain
Date: Tue, 05 May 2009 13:59:20 -0400
Message-Id: <1241546360.1997.0.camel@dhcp231-142.rdu.redhat.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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) {
> 
>