summaryrefslogtreecommitdiffstats
path: root/security/lsm_audit.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-09-11 00:04:49 +0200
committerJames Morris <jmorris@namei.org>2009-09-11 00:04:49 +0200
commita3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch)
tree530c5bdbc534618311dab3e0af245835af56db0f /security/lsm_audit.c
parentLinux 2.6.31 (diff)
parentbinfmt_elf: fix PT_INTERP bss handling (diff)
downloadlinux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.tar.xz
linux-a3c8b97396ef42edfb845788ba6f53b2a93ce980.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'security/lsm_audit.c')
-rw-r--r--security/lsm_audit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 94b868494b31..500aad0ebd6a 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -220,6 +220,8 @@ static void dump_common_audit_data(struct audit_buffer *ab,
}
switch (a->type) {
+ case LSM_AUDIT_NO_AUDIT:
+ return;
case LSM_AUDIT_DATA_IPC:
audit_log_format(ab, " key=%d ", a->u.ipc_id);
break;