commit a6877ea3da9cd2a9a74b75d6bef87995c6209625
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon Apr 23 10:28:26 2018 +0200
- updated apparmor patch
- rel 1
...d-base-infastructure-for-socket-mediation.patch | 40 +++++-----------------
kernel.spec | 2 +-
2 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index d3d30183..156bf0b6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
%define have_pcmcia 0
%endif
-%define rel 0.1
+%define rel 1
%define basever 4.14
%define postver .35
diff --git a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
index 5369c3ae..ae1c211c 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a6877ea3da9cd2a9a74b75d6bef87995c6209625
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
