aboutsummaryrefslogtreecommitdiffstats
path: root/net/appletalk
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/appletalk
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/appletalk')
-rw-r--r--net/appletalk/ddp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 594b59739546..fd1d52f09707 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1026,11 +1026,14 @@ static struct proto ddp_proto = {
1026 * Create a socket. Initialise the socket, blank the addresses 1026 * Create a socket. Initialise the socket, blank the addresses
1027 * set the state. 1027 * set the state.
1028 */ 1028 */
1029static int atalk_create(struct socket *sock, int protocol) 1029static int atalk_create(struct net *net, struct socket *sock, int protocol)
1030{ 1030{
1031 struct sock *sk; 1031 struct sock *sk;
1032 int rc = -ESOCKTNOSUPPORT; 1032 int rc = -ESOCKTNOSUPPORT;
1033 1033
1034 if (net != &init_net)
1035 return -EAFNOSUPPORT;
1036
1034 /* 1037 /*
1035 * We permit SOCK_DGRAM and RAW is an extension. It is trivial to do 1038 * We permit SOCK_DGRAM and RAW is an extension. It is trivial to do
1036 * and gives you the full ELAP frame. Should be handy for CAP 8) 1039 * and gives you the full ELAP frame. Should be handy for CAP 8)
@@ -1038,7 +1041,7 @@ static int atalk_create(struct socket *sock, int protocol)
1038 if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM) 1041 if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
1039 goto out; 1042 goto out;
1040 rc = -ENOMEM; 1043 rc = -ENOMEM;
1041 sk = sk_alloc(PF_APPLETALK, GFP_KERNEL, &ddp_proto, 1); 1044 sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &ddp_proto, 1);
1042 if (!sk) 1045 if (!sk)
1043 goto out; 1046 goto out;
1044 rc = 0; 1047 rc = 0;