1 files changed, 5 insertions, 2 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f45d361e84d..a8d28937379 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -103,7 +103,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         len = min_t(unsigned int, sizeof(la), alen);
         memcpy(&la, addr, len);
 
-        if (la.l2_cid)
+        if (la.l2_cid && la.l2_psm)
                 return -EINVAL;
 
         lock_sock(sk);
@@ -145,6 +145,9 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                         l2cap_pi(sk)->sec_level = BT_SECURITY_SDP;
         }
 
+        if (la.l2_cid)
+                l2cap_pi(sk)->scid = la.l2_cid;
+
         write_unlock_bh(&l2cap_sk_list.lock);
 
 done:
@@ -266,7 +269,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)
                 goto done;
         }
 
-        if (!l2cap_pi(sk)->psm) {
+        if (!l2cap_pi(sk)->psm && !l2cap_pi(sk)->dcid) {
                 bdaddr_t *src = &bt_sk(sk)->src;
                 u16 psm;