vserver 1.9.5.x5

[linux-2.6.git] / net / bluetooth / rfcomm / sock.c

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 1aa1387..a4cd200 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -51,6 +51,8 @@
 #include <asm/uaccess.h>
 
 #include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/rfcomm.h>
 
 #ifndef CONFIG_BT_RFCOMM_DEBUG
@@ -97,17 +99,31 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
 
        if (err)
                sk->sk_err = err;
+
        sk->sk_state = d->state;
 
        parent = bt_sk(sk)->parent;
-       if (!parent) {
+       if (parent) {
+               if (d->state == BT_CLOSED) {
+                       sk->sk_zapped = 1;
+                       bt_accept_unlink(sk);
+               }
+               parent->sk_data_ready(parent, 0);
+       } else {
                if (d->state == BT_CONNECTED)
                        rfcomm_session_getaddr(d->session, &bt_sk(sk)->src, NULL);
                sk->sk_state_change(sk);
-       } else
-               parent->sk_data_ready(parent, 0);
+       }
 
        bh_unlock_sock(sk);
+
+       if (parent && sk->sk_zapped) {
+               /* We have to drop DLC lock here, otherwise
+                * rfcomm_sock_destruct() will dead lock. */
+               rfcomm_dlc_unlock(d);
+               rfcomm_sock_kill(sk);
+               rfcomm_dlc_lock(d);
+       }
 }
 
 /* ---- Socket functions ---- */
@@ -173,7 +189,7 @@ static void rfcomm_sock_destruct(struct sock *sk)
 
        rfcomm_dlc_lock(d);
        rfcomm_pi(sk)->dlc = NULL;
-       
+
        /* Detach DLC if it's owned by this socket */
        if (d->owner == sk)
                d->owner = NULL;
@@ -252,10 +268,18 @@ static void rfcomm_sock_close(struct sock *sk)
 
 static void rfcomm_sock_init(struct sock *sk, struct sock *parent)
 {
+       struct rfcomm_pinfo *pi = rfcomm_pi(sk);
+
        BT_DBG("sk %p", sk);
 
-       if (parent) 
+       if (parent) {
                sk->sk_type = parent->sk_type;
+               pi->link_mode = rfcomm_pi(parent)->link_mode;
+       } else {
+               pi->link_mode = 0;
+       }
+
+       pi->dlc->link_mode = pi->link_mode;
 }
 
 static struct sock *rfcomm_sock_alloc(struct socket *sock, int proto, int prio)
@@ -384,7 +408,7 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a
        return err;
 }
 
-int rfcomm_sock_listen(struct socket *sock, int backlog)
+static int rfcomm_sock_listen(struct socket *sock, int backlog)
 {
        struct sock *sk = sock->sk;
        int err = 0;
@@ -428,7 +452,7 @@ done:
        return err;
 }
 
-int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int flags)
+static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int flags)
 {
        DECLARE_WAITQUEUE(wait, current);
        struct sock *sk = sock->sk, *nsk;
@@ -662,12 +686,22 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
 {
        struct sock *sk = sock->sk;
        int err = 0;
+       u32 opt;
 
        BT_DBG("sk %p", sk);
 
        lock_sock(sk);
 
        switch (optname) {
+       case RFCOMM_LM:
+               if (get_user(opt, (u32 __user *) optval)) {
+                       err = -EFAULT;
+                       break;
+               }
+
+               rfcomm_pi(sk)->link_mode = opt;
+               break;
+
        default:
                err = -ENOPROTOOPT;
                break;
@@ -680,7 +714,9 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
 static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
 {
        struct sock *sk = sock->sk;
-       int len, err = 0; 
+       struct sock *l2cap_sk;
+       struct rfcomm_conninfo cinfo;
+       int len, err = 0;
 
        BT_DBG("sk %p", sk);
 
@@ -690,10 +726,32 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
        lock_sock(sk);
 
        switch (optname) {
+       case RFCOMM_LM:
+               if (put_user(rfcomm_pi(sk)->link_mode, (u32 __user *) optval))
+                       err = -EFAULT;
+               break;
+
+       case RFCOMM_CONNINFO:
+               if (sk->sk_state != BT_CONNECTED) {
+                       err = -ENOTCONN;
+                       break;
+               }
+
+               l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;
+
+               cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle;
+               memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3);
+
+               len = min_t(unsigned int, len, sizeof(cinfo));
+               if (copy_to_user(optval, (char *) &cinfo, len))
+                       err = -EFAULT;
+
+               break;
+
        default:
                err = -ENOPROTOOPT;
                break;
-       };
+       }
 
        release_sock(sk);
        return err;