diff options
author | Denis V. Lunev <den@openvz.org> | 2008-04-03 17:28:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:28:30 -0400 |
commit | 5677242f432102dea9e6eceec1dc089e2f709ca4 (patch) | |
tree | 73036437b91f2e8cd5427be48a588bff3af587eb /net/sctp | |
parent | eee4fe4ded6e9c196168aee8f9787771f4df9c90 (diff) |
[NETNS]: Inet control socket should not hold a namespace.
This is a generic requirement, so make inet_ctl_sock_create namespace
aware and create a inet_ctl_sock_destroy wrapper around
sk_release_kernel.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/protocol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 3c08d334d4a8..067c8a1658d6 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -681,7 +681,7 @@ static int sctp_ctl_sock_init(void) | |||
681 | family = PF_INET; | 681 | family = PF_INET; |
682 | 682 | ||
683 | err = inet_ctl_sock_create(&sctp_ctl_sock, family, | 683 | err = inet_ctl_sock_create(&sctp_ctl_sock, family, |
684 | SOCK_SEQPACKET, IPPROTO_SCTP); | 684 | SOCK_SEQPACKET, IPPROTO_SCTP, &init_net); |
685 | if (err < 0) { | 685 | if (err < 0) { |
686 | printk(KERN_ERR | 686 | printk(KERN_ERR |
687 | "SCTP: Failed to create the SCTP control socket.\n"); | 687 | "SCTP: Failed to create the SCTP control socket.\n"); |
@@ -1284,7 +1284,7 @@ err_v6_add_protocol: | |||
1284 | sctp_v6_del_protocol(); | 1284 | sctp_v6_del_protocol(); |
1285 | err_add_protocol: | 1285 | err_add_protocol: |
1286 | sctp_v4_del_protocol(); | 1286 | sctp_v4_del_protocol(); |
1287 | sock_release(sctp_ctl_sock->sk_socket); | 1287 | inet_ctl_sock_destroy(sctp_ctl_sock); |
1288 | err_ctl_sock_init: | 1288 | err_ctl_sock_init: |
1289 | sctp_v6_protosw_exit(); | 1289 | sctp_v6_protosw_exit(); |
1290 | err_v6_protosw_init: | 1290 | err_v6_protosw_init: |
@@ -1328,7 +1328,7 @@ SCTP_STATIC __exit void sctp_exit(void) | |||
1328 | sctp_v4_del_protocol(); | 1328 | sctp_v4_del_protocol(); |
1329 | 1329 | ||
1330 | /* Free the control endpoint. */ | 1330 | /* Free the control endpoint. */ |
1331 | sock_release(sctp_ctl_sock->sk_socket); | 1331 | inet_ctl_sock_destroy(sctp_ctl_sock); |
1332 | 1332 | ||
1333 | /* Free protosw registrations */ | 1333 | /* Free protosw registrations */ |
1334 | sctp_v6_protosw_exit(); | 1334 | sctp_v6_protosw_exit(); |