aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/avc.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-18 08:57:00 +1000
committerJames Morris <jmorris@namei.org>2010-05-18 08:57:00 +1000
commit539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch)
treee603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/selinux/avc.c
parentba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff)
parent4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff)
downloadkernel_samsung_crespo-539c99fd7fc28f8db257c713c10fb4aceadf8887.zip
kernel_samsung_crespo-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.gz
kernel_samsung_crespo-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.bz2
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/avc.c')
-rw-r--r--security/selinux/avc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 989fef8..7f1a304 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid,
return;
if (!a) {
a = &stack_data;
- memset(a, 0, sizeof(*a));
- a->type = LSM_AUDIT_NO_AUDIT;
+ COMMON_AUDIT_DATA_INIT(a, NONE);
}
a->selinux_audit_data.tclass = tclass;
a->selinux_audit_data.requested = requested;