Skip to content

Commit

Permalink
Bluetooth: hci_event: Make sure ISO events don't affect non-ISO conne…
Browse files Browse the repository at this point in the history
…ctions

ISO events (CIS/BIS) shall only be relevant for connection with link
type of ISO_LINK, otherwise the controller is probably buggy or it is
the result of fuzzer tools such as syzkaller.

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
  • Loading branch information
Vudentz committed Sep 21, 2022
1 parent 7096dab commit ed680f9
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -6791,6 +6791,13 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data,
goto unlock;
}

if (conn->type != ISO_LINK) {
bt_dev_err(hdev,
"Invalid connection link type handle 0x%4.4x",
handle);
goto unlock;
}

if (conn->role == HCI_ROLE_SLAVE) {
__le32 interval;

Expand Down Expand Up @@ -6911,6 +6918,13 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;

if (conn->type != ISO_LINK) {
bt_dev_err(hdev,
"Invalid connection link type handle 0x%2.2x",
ev->handle);
goto unlock;
}

if (ev->num_bis)
conn->handle = __le16_to_cpu(ev->bis_handle[0]);

Expand Down

0 comments on commit ed680f9

Please sign in to comment.