diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /security/apparmor/policy_unpack.c | |
| parent | cffee16e8b997ab947de661e8820e486b0830c94 (diff) | |
| parent | c737f8284cac91428f8fcc8281e69117fa16e887 (diff) | |
| download | lwn-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.tar.gz lwn-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.zip | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'security/apparmor/policy_unpack.c')
| -rw-r--r-- | security/apparmor/policy_unpack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index deab7c7e8dc0..329b1fd30749 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -95,7 +95,7 @@ static int audit_iface(struct aa_profile *new, const char *name, struct aa_profile *profile = __aa_current_profile(); struct common_audit_data sa; struct apparmor_audit_data aad = {0,}; - COMMON_AUDIT_DATA_INIT(&sa, NONE); + sa.type = LSM_AUDIT_DATA_NONE; sa.aad = &aad; if (e) aad.iface.pos = e->pos - e->start; |