aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet
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/packet
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/packet')
-rw-r--r--net/packet/af_packet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 56502292f24c..766b5faaed21 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -977,13 +977,16 @@ static struct proto packet_proto = {
977 * Create a packet of type SOCK_PACKET. 977 * Create a packet of type SOCK_PACKET.
978 */ 978 */
979 979
980static int packet_create(struct socket *sock, int protocol) 980static int packet_create(struct net *net, struct socket *sock, int protocol)
981{ 981{
982 struct sock *sk; 982 struct sock *sk;
983 struct packet_sock *po; 983 struct packet_sock *po;
984 __be16 proto = (__force __be16)protocol; /* weird, but documented */ 984 __be16 proto = (__force __be16)protocol; /* weird, but documented */
985 int err; 985 int err;
986 986
987 if (net != &init_net)
988 return -EAFNOSUPPORT;
989
987 if (!capable(CAP_NET_RAW)) 990 if (!capable(CAP_NET_RAW))
988 return -EPERM; 991 return -EPERM;
989 if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW && 992 if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
@@ -993,7 +996,7 @@ static int packet_create(struct socket *sock, int protocol)
993 sock->state = SS_UNCONNECTED; 996 sock->state = SS_UNCONNECTED;
994 997
995 err = -ENOBUFS; 998 err = -ENOBUFS;
996 sk = sk_alloc(PF_PACKET, GFP_KERNEL, &packet_proto, 1); 999 sk = sk_alloc(net, PF_PACKET, GFP_KERNEL, &packet_proto, 1);
997 if (sk == NULL) 1000 if (sk == NULL)
998 goto out; 1001 goto out;
999 1002