Skip to content

Commit

Permalink
Bluetooth: hci_event: drop only unbound CIS if Set CIG Parameters fails
Browse files Browse the repository at this point in the history
[ Upstream commit 66dee21 ]

When user tries to connect a new CIS when its CIG is not configurable,
that connection shall fail, but pre-existing connections shall not be
affected.  However, currently hci_cc_le_set_cig_params deletes all CIS
of the CIG on error so it doesn't work, even though controller shall not
change CIG/CIS configuration if the command fails.

Fix by failing on command error only the connections that are not yet
bound, so that we keep the previous CIS configuration like the
controller does.

Fixes: 26afbd8 ("Bluetooth: Add initial implementation of CIS connections")
Signed-off-by: Pauli Virtanen <[email protected]>
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
pv authored and gregkh committed Sep 13, 2023
1 parent 090f312 commit 98d1d2e
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -3803,6 +3803,22 @@ static u8 hci_cc_le_read_buffer_size_v2(struct hci_dev *hdev, void *data,
return rp->status;
}

static void hci_unbound_cis_failed(struct hci_dev *hdev, u8 cig, u8 status)
{
struct hci_conn *conn, *tmp;

lockdep_assert_held(&hdev->lock);

list_for_each_entry_safe(conn, tmp, &hdev->conn_hash.list, list) {
if (conn->type != ISO_LINK || !bacmp(&conn->dst, BDADDR_ANY) ||
conn->state == BT_OPEN || conn->iso_qos.ucast.cig != cig)
continue;

if (HCI_CONN_HANDLE_UNSET(conn->handle))
hci_conn_failed(conn, status);
}
}

static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,
struct sk_buff *skb)
{
Expand All @@ -3824,12 +3840,15 @@ static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,

hci_dev_lock(hdev);

/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E page 2554
*
* If the Status return parameter is non-zero, then the state of the CIG
* and its CIS configurations shall not be changed by the command. If
* the CIG did not already exist, it shall not be created.
*/
if (status) {
while ((conn = hci_conn_hash_lookup_cig(hdev, rp->cig_id))) {
conn->state = BT_CLOSED;
hci_connect_cfm(conn, status);
hci_conn_del(conn);
}
/* Keep current configuration, fail only the unbound CIS */
hci_unbound_cis_failed(hdev, rp->cig_id, status);
goto unlock;
}

Expand Down

0 comments on commit 98d1d2e

Please sign in to comment.