Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / security / apparmor / capability.c

diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c
index 088dba3bf7dcbcc9a716c3559842d88819c4ef01..887a5e9489453c9a304b25759b4bed973f34fb0a 100644 (file)
--- a/security/apparmor/capability.c
+++ b/security/apparmor/capability.c
@@ -65,10 +65,10 @@ static int audit_caps(struct aa_profile *profile, struct task_struct *task,
        int type = AUDIT_APPARMOR_AUTO;
        struct common_audit_data sa;
        struct apparmor_audit_data aad = {0,};
-       COMMON_AUDIT_DATA_INIT(&sa, CAP);
+       sa.type = LSM_AUDIT_DATA_CAP;
        sa.aad = &aad;
-       sa.tsk = task;
        sa.u.cap = cap;
+       sa.aad->tsk = task;
        sa.aad->op = OP_CAPABLE;
        sa.aad->error = error;