Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: hci_conn: avoid checking uninitialized CIG/CIS ids

Browse Source 
The CIS/CIG ids of ISO connections are defined only when the connection
is unicast.

Fix the lookup functions to check for unicast first. Ensure CIG/CIS
IDs have valid value also in state BT_OPEN.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Pauli Virtanen 2023-08-05 19:08:42 +03:00 committed by Luiz Augusto von Dentz
parent 66dee21524
commit b5793de3cf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/hci_core.h
View File

@ -1219,7 +1219,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_cis(struct hci_dev *hdev,
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(c, &h->list, list) { list_for_each_entry_rcu(c, &h->list, list) {
if (c->type != ISO_LINK) if (c->type != ISO_LINK || !bacmp(&c->dst, BDADDR_ANY))
continue; continue;
/* Match CIG ID if set */ /* Match CIG ID if set */
@ -1251,7 +1251,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_cig(struct hci_dev *hdev,
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(c, &h->list, list) { list_for_each_entry_rcu(c, &h->list, list) {
if (c->type != ISO_LINK) if (c->type != ISO_LINK || !bacmp(&c->dst, BDADDR_ANY))
continue; continue;
if (handle == c->iso_qos.ucast.cig) { if (handle == c->iso_qos.ucast.cig) {

2
net/bluetooth/hci_conn.c
View File

@ -1866,6 +1866,8 @@ struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
cis->cleanup = cis_cleanup; cis->cleanup = cis_cleanup;
cis->dst_type = dst_type; cis->dst_type = dst_type;
cis->iso_qos.ucast.cig = BT_ISO_QOS_CIG_UNSET;
cis->iso_qos.ucast.cis = BT_ISO_QOS_CIS_UNSET;
} }
if (cis->state == BT_CONNECTED) if (cis->state == BT_CONNECTED)