aboutsummaryrefslogtreecommitdiffstats
path: root/net/rxrpc
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/rxrpc
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/rxrpc')
-rw-r--r--net/rxrpc/af_rxrpc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 122d55d992e1..0803f305ed08 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -606,13 +606,16 @@ static unsigned int rxrpc_poll(struct file *file, struct socket *sock,
606/* 606/*
607 * create an RxRPC socket 607 * create an RxRPC socket
608 */ 608 */
609static int rxrpc_create(struct socket *sock, int protocol) 609static int rxrpc_create(struct net *net, struct socket *sock, int protocol)
610{ 610{
611 struct rxrpc_sock *rx; 611 struct rxrpc_sock *rx;
612 struct sock *sk; 612 struct sock *sk;
613 613
614 _enter("%p,%d", sock, protocol); 614 _enter("%p,%d", sock, protocol);
615 615
616 if (net != &init_net)
617 return -EAFNOSUPPORT;
618
616 /* we support transport protocol UDP only */ 619 /* we support transport protocol UDP only */
617 if (protocol != PF_INET) 620 if (protocol != PF_INET)
618 return -EPROTONOSUPPORT; 621 return -EPROTONOSUPPORT;
@@ -623,7 +626,7 @@ static int rxrpc_create(struct socket *sock, int protocol)
623 sock->ops = &rxrpc_rpc_ops; 626 sock->ops = &rxrpc_rpc_ops;
624 sock->state = SS_UNCONNECTED; 627 sock->state = SS_UNCONNECTED;
625 628
626 sk = sk_alloc(PF_RXRPC, GFP_KERNEL, &rxrpc_proto, 1); 629 sk = sk_alloc(net, PF_RXRPC, GFP_KERNEL, &rxrpc_proto, 1);
627 if (!sk) 630 if (!sk)
628 return -ENOMEM; 631 return -ENOMEM;
629 632