Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

[karo-tx-linux.git] / security / apparmor / file.c

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index d186674f973a37df1aadc38c0a313042163f099d..4d2af4b01033fd40623172c988985fece9b4abde 100644 (file)
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -110,7 +110,8 @@ int aa_audit_file(struct aa_profile *profile, struct file_perms *perms,
        int type = AUDIT_APPARMOR_AUTO;
        struct common_audit_data sa;
        struct apparmor_audit_data aad = {0,};
-       sa.type = LSM_AUDIT_DATA_NONE;
+       sa.type = LSM_AUDIT_DATA_TASK;
+       sa.u.tsk = NULL;
        sa.aad = &aad;
        aad.op = op,
        aad.fs.request = request;