2023-12-08 22:28:57

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: [PATCH v1] Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis

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

hci_conn_hash_lookup_cis shall always match the requested CIG and CIS
ids even when they are unset as otherwise it result in not being able
to bind/connect different sockets to the same address as that would
result in having multiple sockets mapping to the same hci_conn which
doesn't really work and prevents BAP audio configuration such as
AC 6(i) when CIG and CIS are left unset.

Fixes: c14516faede3 ("Bluetooth: hci_conn: Fix not matching by CIS ID")
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
---
include/net/bluetooth/hci_core.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 0c1754f416bd..59105a3eaa16 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1225,11 +1225,11 @@ static inline struct hci_conn *hci_conn_hash_lookup_cis(struct hci_dev *hdev,
continue;

/* Match CIG ID if set */
- if (cig != BT_ISO_QOS_CIG_UNSET && cig != c->iso_qos.ucast.cig)
+ if (cig != c->iso_qos.ucast.cig)
continue;

/* Match CIS ID if set */
- if (id != BT_ISO_QOS_CIS_UNSET && id != c->iso_qos.ucast.cis)
+ if (id != c->iso_qos.ucast.cis)
continue;

/* Match destination address if set */
--
2.43.0



2023-12-08 22:56:14

by bluez.test.bot

[permalink] [raw]
Subject: RE: [v1] Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis

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=808406

---Test result---

Test Summary:
CheckPatch PASS 0.64 seconds
GitLint PASS 0.32 seconds
SubjectPrefix PASS 0.13 seconds
BuildKernel PASS 27.49 seconds
CheckAllWarning PASS 30.15 seconds
CheckSparse PASS 35.45 seconds
CheckSmatch PASS 97.97 seconds
BuildKernel32 PASS 26.65 seconds
TestRunnerSetup PASS 417.49 seconds
TestRunner_l2cap-tester PASS 22.75 seconds
TestRunner_iso-tester PASS 46.65 seconds
TestRunner_bnep-tester PASS 7.00 seconds
TestRunner_mgmt-tester PASS 163.20 seconds
TestRunner_rfcomm-tester PASS 10.75 seconds
TestRunner_sco-tester PASS 14.58 seconds
TestRunner_ioctl-tester PASS 11.90 seconds
TestRunner_mesh-tester PASS 8.86 seconds
TestRunner_smp-tester PASS 9.82 seconds
TestRunner_userchan-tester PASS 7.31 seconds
IncrementalBuild PASS 25.65 seconds



---
Regards,
Linux Bluetooth

2023-12-12 16:20:42

by patchwork-bot+bluetooth

[permalink] [raw]
Subject: Re: [PATCH v1] Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis

Hello:

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

On Fri, 8 Dec 2023 17:28:43 -0500 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> hci_conn_hash_lookup_cis shall always match the requested CIG and CIS
> ids even when they are unset as otherwise it result in not being able
> to bind/connect different sockets to the same address as that would
> result in having multiple sockets mapping to the same hci_conn which
> doesn't really work and prevents BAP audio configuration such as
> AC 6(i) when CIG and CIS are left unset.
>
> [...]

Here is the summary with links:
- [v1] Bluetooth: hci_core: Fix hci_conn_hash_lookup_cis
https://git.kernel.org/bluetooth/bluetooth-next/c/ce168429c3b6

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