1 files changed, 55 insertions, 36 deletions

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index cb4fb7837e5..c0b9ad0524e 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -41,6 +41,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/list.h>
+#include <linux/security.h>
 #include <net/sock.h>
 
 #include <asm/system.h>
@@ -177,6 +178,7 @@ static int sco_connect(struct sock *sk)
 {
         bdaddr_t *src = &bt_sk(sk)->src;
         bdaddr_t *dst = &bt_sk(sk)->dst;
+        __u16 pkt_type = sco_pi(sk)->pkt_type;
         struct sco_conn *conn;
         struct hci_conn *hcon;
         struct hci_dev  *hdev;
@@ -192,10 +194,12 @@ static int sco_connect(struct sock *sk)
 
         if (lmp_esco_capable(hdev) && !disable_esco)
                 type = ESCO_LINK;
-        else
+        else {
                 type = SCO_LINK;
+                pkt_type &= SCO_ESCO_MASK;
+        }
 
-        hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
+        hcon = hci_connect(hdev, type, pkt_type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
         if (IS_ERR(hcon)) {
                 err = PTR_ERR(hcon);
                 goto done;
@@ -403,8 +407,10 @@ static void sco_sock_init(struct sock *sk, struct sock *parent)
 {
         BT_DBG("sk %p", sk);
 
-        if (parent)
+        if (parent) {
                 sk->sk_type = parent->sk_type;
+                security_sk_clone(parent, sk);
+        }
 }
 
 static struct proto sco_proto = {
@@ -460,18 +466,22 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol,
         return 0;
 }
 
-static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
+static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
-        struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
+        struct sockaddr_sco sa;
         struct sock *sk = sock->sk;
-        bdaddr_t *src = &sa->sco_bdaddr;
-        int err = 0;
+        bdaddr_t *src = &sa.sco_bdaddr;
+        int len, err = 0;
 
-        BT_DBG("sk %p %s", sk, batostr(&sa->sco_bdaddr));
+        BT_DBG("sk %p %s", sk, batostr(&sa.sco_bdaddr));
 
         if (!addr || addr->sa_family != AF_BLUETOOTH)
                 return -EINVAL;
 
+        memset(&sa, 0, sizeof(sa));
+        len = min_t(unsigned int, sizeof(sa), alen);
+        memcpy(&sa, addr, len);
+
         lock_sock(sk);
 
         if (sk->sk_state != BT_OPEN) {
@@ -485,7 +495,8 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
                 err = -EADDRINUSE;
         } else {
                 /* Save source address */
-                bacpy(&bt_sk(sk)->src, &sa->sco_bdaddr);
+                bacpy(&bt_sk(sk)->src, &sa.sco_bdaddr);
+                sco_pi(sk)->pkt_type = sa.sco_pkt_type;
                 sk->sk_state = BT_BOUND;
         }
 
@@ -498,27 +509,34 @@ done:
 
 static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags)
 {
-        struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
         struct sock *sk = sock->sk;
-        int err = 0;
-
+        struct sockaddr_sco sa;
+        int len, err = 0;
 
         BT_DBG("sk %p", sk);
 
-        if (alen < sizeof(struct sockaddr_sco) ||
-            addr->sa_family != AF_BLUETOOTH)
+        if (!addr || addr->sa_family != AF_BLUETOOTH)
                 return -EINVAL;
 
-        if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND)
-                return -EBADFD;
-
-        if (sk->sk_type != SOCK_SEQPACKET)
-                return -EINVAL;
+        memset(&sa, 0, sizeof(sa));
+        len = min_t(unsigned int, sizeof(sa), alen);
+        memcpy(&sa, addr, len);
 
         lock_sock(sk);
 
+        if (sk->sk_type != SOCK_SEQPACKET) {
+                err = -EINVAL;
+                goto done;
+        }
+
+        if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND) {
+                err = -EBADFD;
+                goto done;
+        }
+
         /* Set destination address and psm */
-        bacpy(&bt_sk(sk)->dst, &sa->sco_bdaddr);
+        bacpy(&bt_sk(sk)->dst, &sa.sco_bdaddr);
+        sco_pi(sk)->pkt_type = sa.sco_pkt_type;
 
         err = sco_connect(sk);
         if (err)
@@ -564,30 +582,26 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flag
 
         lock_sock(sk);
 
-        if (sk->sk_state != BT_LISTEN) {
-                err = -EBADFD;
-                goto done;
-        }
-
         timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
 
         BT_DBG("sk %p timeo %ld", sk, timeo);
 
         /* Wait for an incoming connection. (wake-one). */
         add_wait_queue_exclusive(sk_sleep(sk), &wait);
-        while (!(ch = bt_accept_dequeue(sk, newsock))) {
+        while (1) {
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (!timeo) {
-                        err = -EAGAIN;
+
+                if (sk->sk_state != BT_LISTEN) {
+                        err = -EBADFD;
                         break;
                 }
 
-                release_sock(sk);
-                timeo = schedule_timeout(timeo);
-                lock_sock(sk);
+                ch = bt_accept_dequeue(sk, newsock);
+                if (ch)
+                        break;
 
-                if (sk->sk_state != BT_LISTEN) {
-                        err = -EBADFD;
+                if (!timeo) {
+                        err = -EAGAIN;
                         break;
                 }
 
@@ -595,8 +609,12 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flag
                         err = sock_intr_errno(timeo);
                         break;
                 }
+
+                release_sock(sk);
+                timeo = schedule_timeout(timeo);
+                lock_sock(sk);
         }
-        set_current_state(TASK_RUNNING);
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(sk_sleep(sk), &wait);
 
         if (err)
@@ -625,6 +643,7 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len
                 bacpy(&sa->sco_bdaddr, &bt_sk(sk)->dst);
         else
                 bacpy(&sa->sco_bdaddr, &bt_sk(sk)->src);
+        sa->sco_pkt_type = sco_pi(sk)->pkt_type;
 
         return 0;
 }
@@ -932,7 +951,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
                 if (conn)
                         sco_conn_ready(conn);
         } else
-                sco_conn_del(hcon, bt_err(status));
+                sco_conn_del(hcon, bt_to_errno(status));
 
         return 0;
 }
@@ -944,7 +963,7 @@ static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
         if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK)
                 return -EINVAL;
 
-        sco_conn_del(hcon, bt_err(reason));
+        sco_conn_del(hcon, bt_to_errno(reason));
 
         return 0;
 }