aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
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/ipv4/af_inet.c
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/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index e68103475cca..110a19edacc8 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -241,7 +241,7 @@ EXPORT_SYMBOL(build_ehash_secret);
241 * Create an inet socket. 241 * Create an inet socket.
242 */ 242 */
243 243
244static int inet_create(struct socket *sock, int protocol) 244static int inet_create(struct net *net, struct socket *sock, int protocol)
245{ 245{
246 struct sock *sk; 246 struct sock *sk;
247 struct list_head *p; 247 struct list_head *p;
@@ -253,6 +253,9 @@ static int inet_create(struct socket *sock, int protocol)
253 int try_loading_module = 0; 253 int try_loading_module = 0;
254 int err; 254 int err;
255 255
256 if (net != &init_net)
257 return -EAFNOSUPPORT;
258
256 if (sock->type != SOCK_RAW && 259 if (sock->type != SOCK_RAW &&
257 sock->type != SOCK_DGRAM && 260 sock->type != SOCK_DGRAM &&
258 !inet_ehash_secret) 261 !inet_ehash_secret)
@@ -320,7 +323,7 @@ lookup_protocol:
320 BUG_TRAP(answer_prot->slab != NULL); 323 BUG_TRAP(answer_prot->slab != NULL);
321 324
322 err = -ENOBUFS; 325 err = -ENOBUFS;
323 sk = sk_alloc(PF_INET, GFP_KERNEL, answer_prot, 1); 326 sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot, 1);
324 if (sk == NULL) 327 if (sk == NULL)
325 goto out; 328 goto out;
326 329