Bluetooth: Handle psm == 0 case inside l2cap_add_psm()

When the user doesn't specify a psm we have the choose one for the
channel. Now we do this inside l2cap_add_psm().

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index f5f3c2cf8a3e25c01f11f30951ee089ec9429d12..fb3f90eaaaa42f7d1e4accb89950755415960b1a 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -458,7 +458,6 @@ void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb);
 void l2cap_streaming_send(struct l2cap_chan *chan);
 int l2cap_ertm_send(struct l2cap_chan *chan);
 
-struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src);
 int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);
 int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);
 

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 98ddd867cfd432154bd4d1be62f9486a4795b7bb..9e3f64f05d49d25931243475d00f2e11c8167aa5 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -135,7 +135,7 @@ static inline struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn
        return c;
 }
 
-struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src)
+static struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src)
 {
        struct sock *sk;
        struct hlist_node *node;
@@ -153,19 +153,35 @@ found:
 
 int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm)
 {
+       int err;
+
        write_lock_bh(&l2cap_sk_list.lock);
 
-       if (__l2cap_get_sock_by_addr(psm, src)) {
-               write_unlock_bh(&l2cap_sk_list.lock);
-               return -EADDRINUSE;
+       if (psm && __l2cap_get_sock_by_addr(psm, src)) {
+               err = -EADDRINUSE;
+               goto done;
        }
 
-       chan->psm = psm;
-       chan->sport = psm;
+       if (psm) {
+               chan->psm = psm;
+               chan->sport = psm;
+               err = 0;
+       } else {
+               u16 p;
 
-       write_unlock_bh(&l2cap_sk_list.lock);
+               err = -EINVAL;
+               for (p = 0x1001; p < 0x1100; p += 2)
+                       if (!__l2cap_get_sock_by_addr(cpu_to_le16(p), src)) {
+                               chan->psm   = cpu_to_le16(p);
+                               chan->sport = cpu_to_le16(p);
+                               err = 0;
+                               break;
+                       }
+       }
 
-       return 0;
+done:
+       write_unlock_bh(&l2cap_sk_list.lock);
+       return err;
 }
 
 int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid)

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 2156dcecec0b00d56badb4f598a35bd7340a48aa..aca99cd5377d130954658a3469ab80d782fe3aa9 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -256,28 +256,6 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)
                goto done;
        }
 
-       if (!chan->psm && !chan->scid) {
-               bdaddr_t *src = &bt_sk(sk)->src;
-               u16 psm;
-
-               err = -EINVAL;
-
-               write_lock_bh(&l2cap_sk_list.lock);
-
-               for (psm = 0x1001; psm < 0x1100; psm += 2)
-                       if (!__l2cap_get_sock_by_addr(cpu_to_le16(psm), src)) {
-                               chan->psm   = cpu_to_le16(psm);
-                               chan->sport = cpu_to_le16(psm);
-                               err = 0;
-                               break;
-                       }
-
-               write_unlock_bh(&l2cap_sk_list.lock);
-
-               if (err < 0)
-                       goto done;
-       }
-
        sk->sk_max_ack_backlog = backlog;
        sk->sk_ack_backlog = 0;
        sk->sk_state = BT_LISTEN;