diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-28 12:29:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 08:37:28 +0000 |
| commit | 3d7214a338d72a66739e83b32fe6e78688051ecc (patch) | |
| tree | 9da12418b510075307ebd7f2957a8929b6571c6b /net/sctp | |
| parent | c73eb1e0cc5675ebb584b3824b71f5c20ca33fc9 (diff) | |
Revert "sctp: do not peel off an assoc from one netns to another one"
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>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 272edd7748a0..7f0f689b8d2b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4457,10 +4457,6 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp) 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; |