diff options
Diffstat (limited to 'security/apparmor/include/audit.h')
-rw-r--r-- | security/apparmor/include/audit.h | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index ff4316e1068d..620e81169659 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h | |||
@@ -121,29 +121,21 @@ struct apparmor_audit_data { | |||
121 | /* these entries require a custom callback fn */ | 121 | /* these entries require a custom callback fn */ |
122 | struct { | 122 | struct { |
123 | struct aa_label *peer; | 123 | struct aa_label *peer; |
124 | union { | 124 | struct { |
125 | struct { | 125 | const char *target; |
126 | kuid_t ouid; | 126 | kuid_t ouid; |
127 | const char *target; | 127 | } fs; |
128 | } fs; | ||
129 | struct { | ||
130 | int type, protocol; | ||
131 | struct sock *peer_sk; | ||
132 | void *addr; | ||
133 | int addrlen; | ||
134 | } net; | ||
135 | int signal; | ||
136 | struct { | ||
137 | int rlim; | ||
138 | unsigned long max; | ||
139 | } rlim; | ||
140 | }; | ||
141 | }; | 128 | }; |
142 | struct { | 129 | struct { |
143 | struct aa_profile *profile; | 130 | struct aa_profile *profile; |
144 | const char *ns; | 131 | const char *ns; |
145 | long pos; | 132 | long pos; |
146 | } iface; | 133 | } iface; |
134 | int signal; | ||
135 | struct { | ||
136 | int rlim; | ||
137 | unsigned long max; | ||
138 | } rlim; | ||
147 | struct { | 139 | struct { |
148 | const char *src_name; | 140 | const char *src_name; |
149 | const char *type; | 141 | const char *type; |