SELinux: unify the selinux_audit_data and selinux_late_audit_data

[~andy/linux] / security / selinux / avc.c

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index c04eea2bdb0a9784e7ba4e8fbe40a62871b69dbd..c03a964ffde249bcf657ca8fc50aeeb6a67f24a9 100644 (file)
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -436,9 +436,9 @@ static void avc_audit_pre_callback(struct audit_buffer *ab, void *a)
 {
        struct common_audit_data *ad = a;
        audit_log_format(ab, "avc:  %s ",
-                        ad->selinux_audit_data->slad->denied ? "denied" : "granted");
-       avc_dump_av(ab, ad->selinux_audit_data->slad->tclass,
-                       ad->selinux_audit_data->slad->audited);
+                        ad->selinux_audit_data->denied ? "denied" : "granted");
+       avc_dump_av(ab, ad->selinux_audit_data->tclass,
+                       ad->selinux_audit_data->audited);
        audit_log_format(ab, " for ");
 }
 
@@ -452,9 +452,9 @@ static void avc_audit_post_callback(struct audit_buffer *ab, void *a)
 {
        struct common_audit_data *ad = a;
        audit_log_format(ab, " ");
-       avc_dump_query(ab, ad->selinux_audit_data->slad->ssid,
-                          ad->selinux_audit_data->slad->tsid,
-                          ad->selinux_audit_data->slad->tclass);
+       avc_dump_query(ab, ad->selinux_audit_data->ssid,
+                          ad->selinux_audit_data->tsid,
+                          ad->selinux_audit_data->tclass);
 }
 
 /* This is the slow part of avc audit with big stack footprint */
@@ -464,13 +464,11 @@ noinline int slow_avc_audit(u32 ssid, u32 tsid, u16 tclass,
                unsigned flags)
 {
        struct common_audit_data stack_data;
-       struct selinux_audit_data sad = {0,};
-       struct selinux_late_audit_data slad;
+       struct selinux_audit_data sad;
 
        if (!a) {
                a = &stack_data;
-               COMMON_AUDIT_DATA_INIT(a, LSM_AUDIT_DATA_NONE);
-               a->selinux_audit_data = &sad;
+               a->type = LSM_AUDIT_DATA_NONE;
        }
 
        /*
@@ -484,14 +482,15 @@ noinline int slow_avc_audit(u32 ssid, u32 tsid, u16 tclass,
            (flags & MAY_NOT_BLOCK))
                return -ECHILD;
 
-       slad.tclass = tclass;
-       slad.requested = requested;
-       slad.ssid = ssid;
-       slad.tsid = tsid;
-       slad.audited = audited;
-       slad.denied = denied;
+       sad.tclass = tclass;
+       sad.requested = requested;
+       sad.ssid = ssid;
+       sad.tsid = tsid;
+       sad.audited = audited;
+       sad.denied = denied;
+
+       a->selinux_audit_data = &sad;
 
-       a->selinux_audit_data->slad = &slad;
        common_lsm_audit(a, avc_audit_pre_callback, avc_audit_post_callback);
        return 0;
 }