From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Fri, 1 Nov 2013 11:34:43 +0000 (+0800)
Subject: audit: don't generate audit feature changed log when audit disabled
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8;p=deliverable%2Flinux.git

audit: don't generate audit feature changed log when audit disabled

If audit is disabled,we shouldn't generate the audit log.

Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/kernel/audit.c b/kernel/audit.c
index 4b6250cf87fd..2360da991721 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -680,6 +680,9 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_feature
 {
 	struct audit_buffer *ab;
 
+	if (audit_enabled == AUDIT_OFF)
+		return;
+
 	ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
 	audit_log_format(ab, "feature=%s old=%d new=%d old_lock=%d new_lock=%d res=%d",
 			 audit_feature_names[which], !!old_feature, !!new_feature,