1 files changed, 31 insertions, 31 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index d58f76bcebd1..b247f9d27fed 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -36,8 +36,6 @@
 
 #include "smp.h"
 
-bool enable_lecoc;
-
 static struct bt_sock_list l2cap_sk_list = {
         .lock = __RW_LOCK_UNLOCKED(l2cap_sk_list.lock)
 };
@@ -101,9 +99,16 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
         if (!bdaddr_type_is_valid(la.l2_bdaddr_type))
                 return -EINVAL;
 
+        if (la.l2_cid) {
+                /* When the socket gets created it defaults to
+                 * CHAN_CONN_ORIENTED, so we need to overwrite the
+                 * default here.
+                 */
+                chan->chan_type = L2CAP_CHAN_FIXED;
+                chan->omtu = L2CAP_DEFAULT_MTU;
+        }
+
         if (bdaddr_type_is_le(la.l2_bdaddr_type)) {
-                if (!enable_lecoc && la.l2_psm)
-                        return -EINVAL;
                 /* We only allow ATT user space socket */
                 if (la.l2_cid &&
                     la.l2_cid != __constant_cpu_to_le16(L2CAP_CID_ATT))
@@ -220,8 +225,6 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
                 return -EINVAL;
 
         if (bdaddr_type_is_le(la.l2_bdaddr_type)) {
-                if (!enable_lecoc && la.l2_psm)
-                        return -EINVAL;
                 /* We only allow ATT user space socket */
                 if (la.l2_cid &&
                     la.l2_cid != __constant_cpu_to_le16(L2CAP_CID_ATT))
@@ -357,17 +360,20 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,
 
         BT_DBG("sock %p, sk %p", sock, sk);
 
+        if (peer && sk->sk_state != BT_CONNECTED)
+                return -ENOTCONN;
+
         memset(la, 0, sizeof(struct sockaddr_l2));
         addr->sa_family = AF_BLUETOOTH;
         *len = sizeof(struct sockaddr_l2);
 
+        la->l2_psm = chan->psm;
+
         if (peer) {
-                la->l2_psm = chan->psm;
                 bacpy(&la->l2_bdaddr, &chan->dst);
                 la->l2_cid = cpu_to_le16(chan->dcid);
                 la->l2_bdaddr_type = chan->dst_type;
         } else {
-                la->l2_psm = chan->sport;
                 bacpy(&la->l2_bdaddr, &chan->src);
                 la->l2_cid = cpu_to_le16(chan->scid);
                 la->l2_bdaddr_type = chan->src_type;
@@ -432,6 +438,10 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
                         opt = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT |
                               L2CAP_LM_SECURE;
                         break;
+                case BT_SECURITY_FIPS:
+                        opt = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT |
+                              L2CAP_LM_SECURE | L2CAP_LM_FIPS;
+                        break;
                 default:
                         opt = 0;
                         break;
@@ -445,6 +455,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
 
                 if (put_user(opt, (u32 __user *) optval))
                         err = -EFAULT;
+
                 break;
 
         case L2CAP_CONNINFO:
@@ -499,6 +510,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
         switch (optname) {
         case BT_SECURITY:
                 if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED &&
+                    chan->chan_type != L2CAP_CHAN_FIXED &&
                     chan->chan_type != L2CAP_CHAN_RAW) {
                         err = -EINVAL;
                         break;
@@ -560,11 +572,6 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
                 break;
 
         case BT_SNDMTU:
-                if (!enable_lecoc) {
-                        err = -EPROTONOSUPPORT;
-                        break;
-                }
-
                 if (!bdaddr_type_is_le(chan->src_type)) {
                         err = -EINVAL;
                         break;
@@ -580,11 +587,6 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
                 break;
 
         case BT_RCVMTU:
-                if (!enable_lecoc) {
-                        err = -EPROTONOSUPPORT;
-                        break;
-                }
-
                 if (!bdaddr_type_is_le(chan->src_type)) {
                         err = -EINVAL;
                         break;
@@ -699,6 +701,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
                         break;
                 }
 
+                if (opt & L2CAP_LM_FIPS) {
+                        err = -EINVAL;
+                        break;
+                }
+
                 if (opt & L2CAP_LM_AUTH)
                         chan->sec_level = BT_SECURITY_LOW;
                 if (opt & L2CAP_LM_ENCRYPT)
@@ -750,6 +757,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
         switch (optname) {
         case BT_SECURITY:
                 if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED &&
+                    chan->chan_type != L2CAP_CHAN_FIXED &&
                     chan->chan_type != L2CAP_CHAN_RAW) {
                         err = -EINVAL;
                         break;
@@ -895,11 +903,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
                 break;
 
         case BT_SNDMTU:
-                if (!enable_lecoc) {
-                        err = -EPROTONOSUPPORT;
-                        break;
-                }
-
                 if (!bdaddr_type_is_le(chan->src_type)) {
                         err = -EINVAL;
                         break;
@@ -912,11 +915,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
                 break;
 
         case BT_RCVMTU:
-                if (!enable_lecoc) {
-                        err = -EPROTONOSUPPORT;
-                        break;
-                }
-
                 if (!bdaddr_type_is_le(chan->src_type)) {
                         err = -EINVAL;
                         break;
@@ -1449,6 +1447,11 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                 chan->tx_credits = pchan->tx_credits;
                 chan->rx_credits = pchan->rx_credits;
 
+                if (chan->chan_type == L2CAP_CHAN_FIXED) {
+                        chan->scid = pchan->scid;
+                        chan->dcid = pchan->scid;
+                }
+
                 security_sk_clone(parent, sk);
         } else {
                 switch (sk->sk_type) {
@@ -1614,6 +1617,3 @@ void l2cap_cleanup_sockets(void)
         bt_sock_unregister(BTPROTO_L2CAP);
         proto_unregister(&l2cap_proto);
 }
-
-module_param(enable_lecoc, bool, 0644);
-MODULE_PARM_DESC(enable_lecoc, "Enable support for LE CoC");