diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-22 03:21:06 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 03:21:06 +0200 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /security/apparmor/policy.c | |
| parent | apparmor: fix long path failure due to disconnected path (diff) | |
| parent | SELinux: remove unused common_audit_data in flush_unauthorized_files (diff) | |
| download | linux-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.tar.xz linux-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.c')
| -rw-r--r-- | security/apparmor/policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index 7f3f455d8eab..cf5fd220309b 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -969,7 +969,7 @@ static int audit_policy(int op, gfp_t gfp, const char *name, const char *info, { 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; aad.op = op; aad.name = name; |