remove queue-3.14/net-use-ns_capable_noaudit-when-determining-net-sysctl-permissions...

diff --git a/queue-3.14/net-use-ns_capable_noaudit-when-determining-net-sysctl-permissions.patch b/queue-3.14/net-use-ns_capable_noaudit-when-determining-net-sysctl-permissions.patch
deleted file mode 100644 (file)
index 40ae227..0000000
--- a/queue-3.14/net-use-ns_capable_noaudit-when-determining-net-sysctl-permissions.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d6e0d306449bcb5fa3c80e7a3edf11d45abf9ae9 Mon Sep 17 00:00:00 2001
-From: Tyler Hicks <tyhicks@canonical.com>
-Date: Thu, 2 Jun 2016 23:43:22 -0500
-Subject: net: Use ns_capable_noaudit() when determining net sysctl permissions
-
-From: Tyler Hicks <tyhicks@canonical.com>
-
-commit d6e0d306449bcb5fa3c80e7a3edf11d45abf9ae9 upstream.
-
-The capability check should not be audited since it is only being used
-to determine the inode permissions. A failed check does not indicate a
-violation of security policy but, when an LSM is enabled, a denial audit
-message was being generated.
-
-The denial audit message caused confusion for some application authors
-because root-running Go applications always triggered the denial. To
-prevent this confusion, the capability check in net_ctl_permissions() is
-switched to the noaudit variant.
-
-BugLink: https://launchpad.net/bugs/1465724
-
-Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
-Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
-Signed-off-by: James Morris <james.l.morris@oracle.com>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/sysctl_net.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/sysctl_net.c
-+++ b/net/sysctl_net.c
-@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
-       kgid_t root_gid = make_kgid(net->user_ns, 0);
- 
-       /* Allow network administrator to have same access as root. */
--      if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
-+      if (ns_capable_noaudit(net->user_ns, CAP_NET_ADMIN) ||
-           uid_eq(root_uid, current_euid())) {
-               int mode = (table->mode >> 6) & 7;
-               return (mode << 6) | (mode << 3) | mode;

diff --git a/queue-3.14/series b/queue-3.14/series
index 251103ee0e96cb986ac187795962a82eb5101e5a..b2a72bcc0e88645f974ecff3b574ff9842402250 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -3,4 +3,3 @@ be2iscsi-fix-bogus-warn_on-length-check.patch
 hid-hid-input-add-parentheses-to-quell-gcc-warning.patch
 alsa-oxygen-fix-logical-not-parentheses-warning.patch
 stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch
-net-use-ns_capable_noaudit-when-determining-net-sysctl-permissions.patch