Bluetooth: A2MP: Process A2MP Get AMP Assoc Request

Example trace when receiving AMP Assoc Request with wrong AMP id.
...
> ACL data: handle 11 flags 0x02 dlen 13
    A2MP: Get AMP Assoc req: id 238
< ACL data: handle 11 flags 0x00 dlen 14
    A2MP: Get AMP Assoc rsp: id 238 status (1) Invalid Controller ID
      assoc data:
...

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 350088e2015a67c66efd283ec9018a0151aa7e4a..b8eeb33d60d7085e30aac81fbfc9f5058e5c6e09 100644 (file)
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -211,6 +211,38 @@ static int a2mp_getinfo_req(struct amp_mgr *mgr, struct sk_buff *skb,
        return 0;
 }
 
+static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
+                               struct a2mp_cmd *hdr)
+{
+       struct a2mp_amp_assoc_req *req = (void *) skb->data;
+       struct hci_dev *hdev;
+
+       if (le16_to_cpu(hdr->len) < sizeof(*req))
+               return -EINVAL;
+
+       BT_DBG("id %d", req->id);
+
+       hdev = hci_dev_get(req->id);
+       if (!hdev || hdev->amp_type == HCI_BREDR) {
+               struct a2mp_amp_assoc_rsp rsp;
+               rsp.id = req->id;
+               rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
+
+               a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, hdr->ident, sizeof(rsp),
+                         &rsp);
+               goto clean;
+       }
+
+       /* Placeholder for HCI Read AMP Assoc */
+
+clean:
+       if (hdev)
+               hci_dev_put(hdev);
+
+       skb_pull(skb, sizeof(*req));
+       return 0;
+}
+
 /* Handle A2MP signalling */
 static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
 {
@@ -253,6 +285,9 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
                        break;
 
                case A2MP_GETAMPASSOC_REQ:
+                       err = a2mp_getampassoc_req(mgr, skb, hdr);
+                       break;
+
                case A2MP_CREATEPHYSLINK_REQ:
                case A2MP_DISCONNPHYSLINK_REQ:
                case A2MP_CHANGE_RSP: