aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-09 02:24:22 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:07 -0400
commit1b8d7ae42d02e483ad94035cca851e4f7fbecb40 (patch)
tree81f8cc0ee49ef99cc67dfed3dc7b7ecb510abf8b /net/ipv6
parent457c4cbc5a3dde259d2a1f15d5f9785290397267 (diff)
[NET]: Make socket creation namespace safe.
This patch passes in the namespace a new socket should be created in and has the socket code do the appropriate reference counting. By virtue of this all socket create methods are touched. In addition the socket create methods are modified so that they will fail if you attempt to create a socket in a non-default network namespace. Failing if we attempt to create a socket outside of the default network namespace ensures that as we incrementally make the network stack network namespace aware we will not export functionality that someone has not audited and made certain is network namespace safe. Allowing us to partially enable network namespaces before all of the exotic protocols are supported. Any protocol layers I have missed will fail to compile because I now pass an extra parameter into the socket creation code. [ Integrated AF_IUCV build fixes from Andrew Morton... -DaveM ] Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/af_inet6.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index b5f96372ad73..21931c86e95b 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -81,7 +81,7 @@ static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
81 return (struct ipv6_pinfo *)(((u8 *)sk) + offset); 81 return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
82} 82}
83 83
84static int inet6_create(struct socket *sock, int protocol) 84static int inet6_create(struct net *net, struct socket *sock, int protocol)
85{ 85{
86 struct inet_sock *inet; 86 struct inet_sock *inet;
87 struct ipv6_pinfo *np; 87 struct ipv6_pinfo *np;
@@ -94,6 +94,9 @@ static int inet6_create(struct socket *sock, int protocol)
94 int try_loading_module = 0; 94 int try_loading_module = 0;
95 int err; 95 int err;
96 96
97 if (net != &init_net)
98 return -EAFNOSUPPORT;
99
97 if (sock->type != SOCK_RAW && 100 if (sock->type != SOCK_RAW &&
98 sock->type != SOCK_DGRAM && 101 sock->type != SOCK_DGRAM &&
99 !inet_ehash_secret) 102 !inet_ehash_secret)
@@ -159,7 +162,7 @@ lookup_protocol:
159 BUG_TRAP(answer_prot->slab != NULL); 162 BUG_TRAP(answer_prot->slab != NULL);
160 163
161 err = -ENOBUFS; 164 err = -ENOBUFS;
162 sk = sk_alloc(PF_INET6, GFP_KERNEL, answer_prot, 1); 165 sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot, 1);
163 if (sk == NULL) 166 if (sk == NULL)
164 goto out; 167 goto out;
165 168