From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Nov 2017 11:31:52 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v3.18.85~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d167de74fea15a79d5e0e42e9657445b69d3804e;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	revert-sctp-do-not-peel-off-an-assoc-from-one-netns-to.patch
---

diff --git a/queue-4.4/revert-sctp-do-not-peel-off-an-assoc-from-one-netns-to.patch b/queue-4.4/revert-sctp-do-not-peel-off-an-assoc-from-one-netns-to.patch
new file mode 100644
index 00000000000..93dd692f815
--- /dev/null
+++ b/queue-4.4/revert-sctp-do-not-peel-off-an-assoc-from-one-netns-to.patch
@@ -0,0 +1,35 @@
+From c76eb04f0895952a58f0029223f181854901e52e Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 28 Nov 2017 12:29:45 +0100
+Subject: Revert "sctp: do not peel off an assoc from one netns to another one"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 2a0e60907e54dad75e9b3568d02bec11d6e74f6b which is
+commit df80cd9b28b9ebaa284a41df611dbf3a2d05ca74 upstream as I messed up
+by applying it to the tree twice.
+
+Reported-by: Michal Kubecek <mkubecek@suse.cz>
+Cc: ChunYu Wang <chunwang@redhat.com>
+Cc: Xin Long <lucien.xin@gmail.com>
+Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
+Cc: Neil Horman <nhorman@tuxdriver.com>
+Cc: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sctp/socket.c |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/net/sctp/socket.c
++++ b/net/sctp/socket.c
+@@ -4457,10 +4457,6 @@ int sctp_do_peeloff(struct sock *sk, sct
+ 	if (!net_eq(current->nsproxy->net_ns, sock_net(sk)))
+ 		return -EINVAL;
+ 
+-	/* Do not peel off from one netns to another one. */
+-	if (!net_eq(current->nsproxy->net_ns, sock_net(sk)))
+-		return -EINVAL;
+-
+ 	if (!asoc)
+ 		return -EINVAL;
+ 
diff --git a/queue-4.4/series b/queue-4.4/series
index b329cb338ab..ed69a1e813a 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -94,3 +94,4 @@ btrfs-return-the-actual-error-value-from-from-btrfs_uuid_tree_iterate.patch
 asoc-wm_adsp-don-t-overrun-firmware-file-buffer-when-reading-region-data.patch
 s390-kbuild-enable-modversions-for-symbols-exported-from-asm.patch
 xen-xenbus-driver-must-not-accept-invalid-transaction-ids.patch
+revert-sctp-do-not-peel-off-an-assoc-from-one-netns-to.patch