Skip to content

Bluetooth: Controller: Only validate CIS SDU interval for BN > 0 #88939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Bluetooth: Controller: Only validate CIS SDU interval for BN > 0 #88939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,13 @@ static uint8_t rp_cc_validate_req(struct ll_conn *conn, struct proc_ctx *ctx,
/* Note: SDU intervals are 20 bits; Mask away RFU bits */
c_sdu_interval = sys_get_le24(pdu->llctrl.cis_req.c_sdu_interval) & 0x0FFFFF;
p_sdu_interval = sys_get_le24(pdu->llctrl.cis_req.p_sdu_interval) & 0x0FFFFF;
if (c_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN ||
p_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN) {
/*
* Some in-the-wild devices use SDU interval of 0 when BN == 0; This is not allowed by
* BT Core Spec v6.0, but is not specifically mentioned in v5.4 and earlier. To allow
* connecting a CIS to these devices, relax the check on SDU interval
*/
if ((pdu->llctrl.cis_req.c_bn > 0 && c_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN) ||
(pdu->llctrl.cis_req.p_bn > 0 && p_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN)) {
Comment on lines +357 to +358
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ((pdu->llctrl.cis_req.c_bn > 0 && c_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN) ||
(pdu->llctrl.cis_req.p_bn > 0 && p_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN)) {
/*
Some in the-wild devices use SDU interval of 0 when BN == 0; This
is not allowed by BT Core Spec v6.0, but is not specifically
mentioned in v5.4 and earlier. To allow connecting a CIS to these
devices, relax the check on SDU interval
*/
if ((pdu->llctrl.cis_req.c_bn > 0 && c_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN) ||
(pdu->llctrl.cis_req.p_bn > 0 && p_sdu_interval < BT_HCI_ISO_SDU_INTERVAL_MIN)) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the comment

return BT_HCI_ERR_INVALID_LL_PARAM;
}

Expand Down