Bluetooth: hci_sync: Fix not handling ISO_LINK in hci_abort_conn_sync

ISO_LINK connections where not being handled properly on
hci_abort_conn_sync which sometimes resulted in sending the wrong
commands, or in case of having the reject command being sent by the
socket code (iso.c) which is sort of a layer violation.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index fa9236d..a0ffe7d 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1223,7 +1223,12 @@ void hci_conn_failed(struct hci_conn *conn, u8 status)
 
 static void create_le_conn_complete(struct hci_dev *hdev, void *data, int err)
 {
-       struct hci_conn *conn = data;
+       struct hci_conn *conn;
+       u16 handle = PTR_ERR(data);
+
+       conn = hci_conn_hash_lookup_handle(hdev, handle);
+       if (!conn)
+               return;
 
        bt_dev_dbg(hdev, "err %d", err);
 
@@ -1248,10 +1253,17 @@ done:
 
 static int hci_connect_le_sync(struct hci_dev *hdev, void *data)
 {
-       struct hci_conn *conn = data;
+       struct hci_conn *conn;
+       u16 handle = PTR_ERR(data);
+
+       conn = hci_conn_hash_lookup_handle(hdev, handle);
+       if (!conn)
+               return 0;
 
        bt_dev_dbg(hdev, "conn %p", conn);
 
+       conn->state = BT_CONNECT;
+
        return hci_le_create_conn_sync(hdev, conn);
 }
 
@@ -1321,10 +1333,10 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
        conn->sec_level = BT_SECURITY_LOW;
        conn->conn_timeout = conn_timeout;
 
-       conn->state = BT_CONNECT;
        clear_bit(HCI_CONN_SCANNING, &conn->flags);
 
-       err = hci_cmd_sync_queue(hdev, hci_connect_le_sync, conn,
+       err = hci_cmd_sync_queue(hdev, hci_connect_le_sync,
+                                ERR_PTR(conn->handle),
                                 create_le_conn_complete);
        if (err) {
                hci_conn_del(conn);
@@ -2858,6 +2870,9 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)
        /* If the connection is pending check the command opcode since that
         * might be blocking on hci_cmd_sync_work while waiting its respective
         * event so we need to hci_cmd_sync_cancel to cancel it.
+        *
+        * hci_connect_le serializes the connection attempts so only one
+        * connection can be in BT_CONNECT at time.
         */
        if (conn->state == BT_CONNECT && hdev->req_status == HCI_REQ_PEND) {
                switch (hci_skb_event(hdev->sent_cmd)) {

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 5f7a901..c085b54 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5296,6 +5296,24 @@ static int hci_connect_cancel_sync(struct hci_dev *hdev, struct hci_conn *conn,
        if (conn->type == LE_LINK)
                return hci_le_connect_cancel_sync(hdev, conn, reason);
 
+       if (conn->type == ISO_LINK) {
+               /* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
+                * page 1857:
+                *
+                * If this command is issued for a CIS on the Central and the
+                * CIS is successfully terminated before being established,
+                * then an HCI_LE_CIS_Established event shall also be sent for
+                * this CIS with the Status Operation Cancelled by Host (0x44).
+                */
+               if (test_bit(HCI_CONN_CREATE_CIS, &conn->flags))
+                       return hci_disconnect_sync(hdev, conn, reason);
+
+               /* There is no way to cancel a BIS without terminating the BIG
+                * which is done later on connection cleanup.
+                */
+               return 0;
+       }
+
        if (hdev->hci_ver < BLUETOOTH_VER_1_2)
                return 0;
 
@@ -5322,11 +5340,27 @@ static int hci_reject_sco_sync(struct hci_dev *hdev, struct hci_conn *conn,
                                     sizeof(cp), &cp, HCI_CMD_TIMEOUT);
 }
 
+static int hci_le_reject_cis_sync(struct hci_dev *hdev, struct hci_conn *conn,
+                                 u8 reason)
+{
+       struct hci_cp_le_reject_cis cp;
+
+       memset(&cp, 0, sizeof(cp));
+       cp.handle = cpu_to_le16(conn->handle);
+       cp.reason = reason;
+
+       return __hci_cmd_sync_status(hdev, HCI_OP_LE_REJECT_CIS,
+                                    sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
 static int hci_reject_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
                                u8 reason)
 {
        struct hci_cp_reject_conn_req cp;
 
+       if (conn->type == ISO_LINK)
+               return hci_le_reject_cis_sync(hdev, conn, reason);
+
        if (conn->type == SCO_LINK || conn->type == ESCO_LINK)
                return hci_reject_sco_sync(hdev, conn, reason);
 

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 84d238d..9c41af5 100644 (file)
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -614,18 +614,6 @@ static void iso_sock_kill(struct sock *sk)
        sock_put(sk);
 }
 
-static void iso_conn_defer_reject(struct hci_conn *conn)
-{
-       struct hci_cp_le_reject_cis cp;
-
-       BT_DBG("conn %p", conn);
-
-       memset(&cp, 0, sizeof(cp));
-       cp.handle = cpu_to_le16(conn->handle);
-       cp.reason = HCI_ERROR_REJ_BAD_ADDR;
-       hci_send_cmd(conn->hdev, HCI_OP_LE_REJECT_CIS, sizeof(cp), &cp);
-}
-
 static void __iso_sock_close(struct sock *sk)
 {
        BT_DBG("sk %p state %d socket %p", sk, sk->sk_state, sk->sk_socket);
@@ -650,8 +638,6 @@ static void __iso_sock_close(struct sock *sk)
                break;
 
        case BT_CONNECT2:
-               if (iso_pi(sk)->conn->hcon)
-                       iso_conn_defer_reject(iso_pi(sk)->conn->hcon);
                iso_chan_del(sk, ECONNRESET);
                break;
        case BT_CONNECT: