index 620e81169659..ff4316e1068d 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
-@@ -121,21 +121,29 @@ struct apparmor_audit_data {
- /* these entries require a custom callback fn */
- struct {
+@@ -121,9 +121,15 @@ struct apparmor_audit_data {
struct aa_label *peer;
-- struct {
-- const char *target;
-- kuid_t ouid;
-- } fs;
-+ union {
-+ struct {
-+ kuid_t ouid;
+ union {
+ struct {
+- const char *target;
+ kuid_t ouid;
+ const char *target;
-+ } fs;
+ } fs;
+ struct {
+ int type, protocol;
+ struct sock *peer_sk;
+ void *addr;
+ int addrlen;
+ } net;
-+ int signal;
-+ struct {
-+ int rlim;
-+ unsigned long max;
-+ } rlim;
-+ };
- };
- struct {
- struct aa_profile *profile;
- const char *ns;
- long pos;
- } iface;
-- int signal;
-- struct {
-- int rlim;
-- unsigned long max;
-- } rlim;
- struct {
- const char *src_name;
- const char *type;
+ struct {
+ int rlim;
+ unsigned long max;
diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
new file mode 100644
index 000000000000..140c8efcf364