summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-11-01 19:34:43 +0800
committerEric Paris <eparis@redhat.com>2014-01-13 22:29:06 -0500
commitb6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8 (patch)
treea66ff293f4ead81516d7456b61a32604bcf216db /kernel
parentaabce351b514e21e7768929ba6e5fbd87dc3848c (diff)
downloadlinux-b6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8.tar.gz
linux-b6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8.tar.bz2
linux-b6c50fe0be5b3a6be9c26f6941bc8c94cfaac1f8.zip
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit.c3
1 files changed, 3 insertions, 0 deletions
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,