2022-09-19 18:14:40

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: [PATCH] Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections

From: Luiz Augusto von Dentz <[email protected]>

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]>
---
net/bluetooth/hci_event.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ed3e5b251af1..faca701bce2a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;

@@ -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]);

--
2.37.3


2022-09-19 19:26:07

by bluez.test.bot

[permalink] [raw]
Subject: RE: Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=678338

---Test result---

Test Summary:
CheckPatch PASS 2.07 seconds
GitLint PASS 1.12 seconds
SubjectPrefix PASS 0.91 seconds
BuildKernel PASS 36.32 seconds
BuildKernel32 PASS 31.16 seconds
Incremental Build with patchesPASS 46.26 seconds
TestRunner: Setup PASS 524.19 seconds
TestRunner: l2cap-tester PASS 17.65 seconds
TestRunner: iso-tester PASS 16.80 seconds
TestRunner: bnep-tester PASS 6.73 seconds
TestRunner: mgmt-tester PASS 107.16 seconds
TestRunner: rfcomm-tester PASS 10.41 seconds
TestRunner: sco-tester PASS 9.90 seconds
TestRunner: smp-tester PASS 9.86 seconds
TestRunner: userchan-tester PASS 6.90 seconds



---
Regards,
Linux Bluetooth

2022-09-21 22:54:34

by patchwork-bot+bluetooth

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Mon, 19 Sep 2022 11:10:17 -0700 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> 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]>
>
> [...]

Here is the summary with links:
- Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections
https://git.kernel.org/bluetooth/bluetooth-next/c/ed680f925aea

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html