diff mbox series

[BlueZ] btdev: Fix not checking if a CIG has any active CIS

Message ID 20220708002751.2308369-1-luiz.dentz@gmail.com (mailing list archive)
State Accepted
Commit 163de8e231e6e138ebfea710df8211f22d4b9b4e
Headers show
Series [BlueZ] btdev: Fix not checking if a CIG has any active CIS | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/checkpatch success Checkpatch PASS
tedd_an/gitlint success Gitlint PASS
tedd_an/setupell success Setup ELL PASS
tedd_an/buildprep success Build Prep PASS
tedd_an/build success Build Configuration PASS
tedd_an/makecheck success Make Check PASS
tedd_an/makecheckvalgrind success Make Check PASS
tedd_an/makedistcheck success Make Distcheck PASS
tedd_an/build_extell success Build External ELL PASS
tedd_an/build_extell_make success Build Make with External ELL PASS
tedd_an/scan_build success Pass

Commit Message

Luiz Augusto von Dentz July 8, 2022, 12:27 a.m. UTC
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Bluetooth Core specification says the CIG must be in configurable state
in order to accept the SetCIGParameters:

BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2553:

 'If the Host issues this command when the CIG is not in the
  configurable state, the Controller shall return the error
  code Command Disallowed (0x0C).'
---
 emulator/btdev.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

bluez.test.bot@gmail.com July 8, 2022, 3:01 a.m. UTC | #1
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=657632

---Test result---

Test Summary:
CheckPatch                    PASS      0.77 seconds
GitLint                       PASS      0.55 seconds
Prep - Setup ELL              PASS      26.20 seconds
Build - Prep                  PASS      0.57 seconds
Build - Configure             PASS      8.09 seconds
Build - Make                  PASS      724.77 seconds
Make Check                    PASS      11.08 seconds
Make Check w/Valgrind         PASS      281.28 seconds
Make Distcheck                PASS      231.89 seconds
Build w/ext ELL - Configure   PASS      8.09 seconds
Build w/ext ELL - Make        PASS      79.95 seconds
Incremental Build w/ patches  PASS      0.00 seconds
Scan Build                    PASS      472.76 seconds



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org July 11, 2022, 4:40 p.m. UTC | #2
Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Thu,  7 Jul 2022 17:27:51 -0700 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> Bluetooth Core specification says the CIG must be in configurable state
> in order to accept the SetCIGParameters:
> 
> BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2553:
> 
> [...]

Here is the summary with links:
  - [BlueZ] btdev: Fix not checking if a CIG has any active CIS
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=163de8e231e6

You are awesome, thank you!
diff mbox series

Patch

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 641e308b3..3fdfb64a9 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -5831,8 +5831,25 @@  static int cmd_set_cig_params(struct btdev *dev, const void *data,
 	rsp.params.cig_id = cmd->cig_id;
 
 	for (i = 0; i < cmd->num_cis; i++) {
+		struct btdev_conn *iso;
+
 		rsp.params.num_handles++;
 		rsp.handle[i] = cpu_to_le16(ISO_HANDLE + i);
+
+		/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
+		 * page 2553
+		 *
+		 * If the Host issues this command when the CIG is not in the
+		 * configurable state, the Controller shall return the error
+		 * code Command Disallowed (0x0C).
+		 */
+		iso = queue_find(dev->conns, match_handle,
+				UINT_TO_PTR(cpu_to_le16(rsp.handle[i])));
+		if (iso) {
+			rsp.params.status = BT_HCI_ERR_INVALID_PARAMETERS;
+			i = 0;
+			goto done;
+		}
 	}
 
 done: