aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/af_bluetooth.c
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/bluetooth/af_bluetooth.c
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/bluetooth/af_bluetooth.c')
-rw-r--r--net/bluetooth/af_bluetooth.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index d942b946ba07..1220d8a41eb5 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -95,10 +95,13 @@ int bt_sock_unregister(int proto)
95} 95}
96EXPORT_SYMBOL(bt_sock_unregister); 96EXPORT_SYMBOL(bt_sock_unregister);
97 97
98static int bt_sock_create(struct socket *sock, int proto) 98static int bt_sock_create(struct net *net, struct socket *sock, int proto)
99{ 99{
100 int err; 100 int err;
101 101
102 if (net != &init_net)
103 return -EAFNOSUPPORT;
104
102 if (proto < 0 || proto >= BT_MAX_PROTO) 105 if (proto < 0 || proto >= BT_MAX_PROTO)
103 return -EINVAL; 106 return -EINVAL;
104 107
@@ -113,7 +116,7 @@ static int bt_sock_create(struct socket *sock, int proto)
113 read_lock(&bt_proto_lock); 116 read_lock(&bt_proto_lock);
114 117
115 if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { 118 if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) {
116 err = bt_proto[proto]->create(sock, proto); 119 err = bt_proto[proto]->create(net, sock, proto);
117 module_put(bt_proto[proto]->owner); 120 module_put(bt_proto[proto]->owner);
118 } 121 }
119 122