LSM: shrink sizeof LSM specific portion of common_audit_data

[~andy/linux] / security / apparmor / resource.c

diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
index 72c25a4f2cfdb94cb80c728f905d21e647972c7a..2fe8613efe33704c668d5f895204e8f05f32fc56 100644 (file)
--- a/security/apparmor/resource.c
+++ b/security/apparmor/resource.c
@@ -34,7 +34,7 @@ static void audit_cb(struct audit_buffer *ab, void *va)
        struct common_audit_data *sa = va;
 
        audit_log_format(ab, " rlimit=%s value=%lu",
-                        rlim_names[sa->aad.rlim.rlim], sa->aad.rlim.max);
+                        rlim_names[sa->aad->rlim.rlim], sa->aad->rlim.max);
 }
 
 /**
@@ -50,12 +50,14 @@ static int audit_resource(struct aa_profile *profile, unsigned int resource,
                          unsigned long value, int error)
 {
        struct common_audit_data sa;
+       struct apparmor_audit_data aad = {0,};
 
        COMMON_AUDIT_DATA_INIT(&sa, NONE);
-       sa.aad.op = OP_SETRLIMIT,
-       sa.aad.rlim.rlim = resource;
-       sa.aad.rlim.max = value;
-       sa.aad.error = error;
+       sa.aad = &aad;
+       aad.op = OP_SETRLIMIT,
+       aad.rlim.rlim = resource;
+       aad.rlim.max = value;
+       aad.error = error;
        return aa_audit(AUDIT_APPARMOR_AUTO, profile, GFP_KERNEL, &sa,
                        audit_cb);
 }