- up to 4.14.207

[packages/kernel.git] / 0012-apparmor-add-base-infastructure-for-socket-mediation.patch

diff --git a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
index 5369c3aea581e1ef3ea0c54837d44729d4f9cae9..ae1c211cd88958b8514fb8cb356847f2033352c6 100644 (file)
--- a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
+++ b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
@@ -200,47 +200,23 @@ diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit
 index 620e81169659..ff4316e1068d 100644
 --- a/security/apparmor/include/audit.h
 +++ b/security/apparmor/include/audit.h
-@@ -121,23 +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;
--                      union {
--                              struct {
+                       union {
+                               struct {
 -                                      const char *target;
--                                      kuid_t ouid;
--                              } fs;
--                              int signal;
--                      };
-+                      union {
-+                              struct {
-+                                      kuid_t ouid;
+                                       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;
--              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