diff options
| author | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/selinux/avc.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/avc.c')
| -rw-r--r-- | security/selinux/avc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 989fef82563a..7f1a304712a9 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid, | |||
| 499 | return; | 499 | return; |
| 500 | if (!a) { | 500 | if (!a) { |
| 501 | a = &stack_data; | 501 | a = &stack_data; |
| 502 | memset(a, 0, sizeof(*a)); | 502 | COMMON_AUDIT_DATA_INIT(a, NONE); |
| 503 | a->type = LSM_AUDIT_NO_AUDIT; | ||
| 504 | } | 503 | } |
| 505 | a->selinux_audit_data.tclass = tclass; | 504 | a->selinux_audit_data.tclass = tclass; |
| 506 | a->selinux_audit_data.requested = requested; | 505 | a->selinux_audit_data.requested = requested; |