aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose
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/rose
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/rose')
-rw-r--r--net/rose/af_rose.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 48319f7991ac..67e06ab7f854 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -499,15 +499,18 @@ static struct proto rose_proto = {
499 .obj_size = sizeof(struct rose_sock), 499 .obj_size = sizeof(struct rose_sock),
500}; 500};
501 501
502static int rose_create(struct socket *sock, int protocol) 502static int rose_create(struct net *net, struct socket *sock, int protocol)
503{ 503{
504 struct sock *sk; 504 struct sock *sk;
505 struct rose_sock *rose; 505 struct rose_sock *rose;
506 506
507 if (net != &init_net)
508 return -EAFNOSUPPORT;
509
507 if (sock->type != SOCK_SEQPACKET || protocol != 0) 510 if (sock->type != SOCK_SEQPACKET || protocol != 0)
508 return -ESOCKTNOSUPPORT; 511 return -ESOCKTNOSUPPORT;
509 512
510 if ((sk = sk_alloc(PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL) 513 if ((sk = sk_alloc(net, PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL)
511 return -ENOMEM; 514 return -ENOMEM;
512 515
513 rose = rose_sk(sk); 516 rose = rose_sk(sk);
@@ -545,7 +548,7 @@ static struct sock *rose_make_new(struct sock *osk)
545 if (osk->sk_type != SOCK_SEQPACKET) 548 if (osk->sk_type != SOCK_SEQPACKET)
546 return NULL; 549 return NULL;
547 550
548 if ((sk = sk_alloc(PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL) 551 if ((sk = sk_alloc(osk->sk_net, PF_ROSE, GFP_ATOMIC, &rose_proto, 1)) == NULL)
549 return NULL; 552 return NULL;
550 553
551 rose = rose_sk(sk); 554 rose = rose_sk(sk);