[TCP]: tcp_simple_retransmit can cause S+L

[linux-2.6] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index c7228cfc6218b031e17a5f2779595ea365499ce4..d366423c8392473e43c8cf2248e33a626bee3eaa 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -53,6 +53,30 @@
 /* Bluetooth sockets */
 #define BT_MAX_PROTO   8
 static struct net_proto_family *bt_proto[BT_MAX_PROTO];
+
+static struct lock_class_key bt_slock_key[BT_MAX_PROTO];
+static struct lock_class_key bt_lock_key[BT_MAX_PROTO];
+static const char *bt_key_strings[BT_MAX_PROTO] = {
+       "sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_HCI",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_SCO",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_BNEP",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_CMTP",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_HIDP",
+       "sk_lock-AF_BLUETOOTH-BTPROTO_AVDTP",
+};
+
+static const char *bt_slock_key_strings[BT_MAX_PROTO] = {
+       "slock-AF_BLUETOOTH-BTPROTO_L2CAP",
+       "slock-AF_BLUETOOTH-BTPROTO_HCI",
+       "slock-AF_BLUETOOTH-BTPROTO_SCO",
+       "slock-AF_BLUETOOTH-BTPROTO_RFCOMM",
+       "slock-AF_BLUETOOTH-BTPROTO_BNEP",
+       "slock-AF_BLUETOOTH-BTPROTO_CMTP",
+       "slock-AF_BLUETOOTH-BTPROTO_HIDP",
+       "slock-AF_BLUETOOTH-BTPROTO_AVDTP",
+};
 static DEFINE_RWLOCK(bt_proto_lock);
 
 int bt_sock_register(int proto, struct net_proto_family *ops)
@@ -95,10 +119,28 @@ int bt_sock_unregister(int proto)
 }
 EXPORT_SYMBOL(bt_sock_unregister);
 
-static int bt_sock_create(struct socket *sock, int proto)
+static void bt_reclassify_sock_lock(struct socket *sock, int proto)
+{
+       struct sock *sk = sock->sk;
+
+       if (!sk)
+               return;
+       BUG_ON(sock_owned_by_user(sk));
+
+       sock_lock_init_class_and_name(sk,
+                       bt_slock_key_strings[proto],
+                       &bt_slock_key[proto],
+                       bt_key_strings[proto],
+                       &bt_lock_key[proto]);
+}
+
+static int bt_sock_create(struct net *net, struct socket *sock, int proto)
 {
        int err;
 
+       if (net != &init_net)
+               return -EAFNOSUPPORT;
+
        if (proto < 0 || proto >= BT_MAX_PROTO)
                return -EINVAL;
 
@@ -113,7 +155,8 @@ static int bt_sock_create(struct socket *sock, int proto)
        read_lock(&bt_proto_lock);
 
        if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) {
-               err = bt_proto[proto]->create(sock, proto);
+               err = bt_proto[proto]->create(net, sock, proto);
+               bt_reclassify_sock_lock(sock, proto);
                module_put(bt_proto[proto]->owner);
        }
 
@@ -221,7 +264,7 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                copied = len;
        }
 
-       skb->h.raw = skb->data;
+       skb_reset_transport_header(skb);
        err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
 
        skb_free_datagram(sk, skb);