aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipx
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/ipx
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/ipx')
-rw-r--r--net/ipx/af_ipx.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 8400525177ab..ee28babad227 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1360,11 +1360,14 @@ static struct proto ipx_proto = {
1360 .obj_size = sizeof(struct ipx_sock), 1360 .obj_size = sizeof(struct ipx_sock),
1361}; 1361};
1362 1362
1363static int ipx_create(struct socket *sock, int protocol) 1363static int ipx_create(struct net *net, struct socket *sock, int protocol)
1364{ 1364{
1365 int rc = -ESOCKTNOSUPPORT; 1365 int rc = -ESOCKTNOSUPPORT;
1366 struct sock *sk; 1366 struct sock *sk;
1367 1367
1368 if (net != &init_net)
1369 return -EAFNOSUPPORT;
1370
1368 /* 1371 /*
1369 * SPX support is not anymore in the kernel sources. If you want to 1372 * SPX support is not anymore in the kernel sources. If you want to
1370 * ressurrect it, completing it and making it understand shared skbs, 1373 * ressurrect it, completing it and making it understand shared skbs,
@@ -1375,7 +1378,7 @@ static int ipx_create(struct socket *sock, int protocol)
1375 goto out; 1378 goto out;
1376 1379
1377 rc = -ENOMEM; 1380 rc = -ENOMEM;
1378 sk = sk_alloc(PF_IPX, GFP_KERNEL, &ipx_proto, 1); 1381 sk = sk_alloc(net, PF_IPX, GFP_KERNEL, &ipx_proto, 1);
1379 if (!sk) 1382 if (!sk)
1380 goto out; 1383 goto out;
1381#ifdef IPX_REFCNT_DEBUG 1384#ifdef IPX_REFCNT_DEBUG