Skip to content

[Backport v2.5-branch] Bluetooth: L2CAP: ECRED fixes #33419

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 3 commits into from
Mar 18, 2021
Merged

[Backport v2.5-branch] Bluetooth: L2CAP: ECRED fixes #33419

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc0c4b3
Bluetooth: L2CAP: Fix not checking for L2CAP_ECRED_CHAN_MAX
Vudentz Mar 12, 2021
b30d14d
Bluetooth: L2CAP: Fix invalid BT_L2CAP_ECRED_CONN_RSP
Vudentz Mar 12, 2021
43fe809
Bluetooth: L2CAP: Fix not including all DCIDs
Vudentz Mar 16, 2021
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
25 changes: 13 additions & 12 deletions subsys/bluetooth/host/l2cap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,13 @@ static void le_ecred_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
}

req = net_buf_pull_mem(buf, sizeof(*req));

if (buf->len > sizeof(dcid)) {
BT_ERR("Too large LE conn req packet size");
result = BT_L2CAP_LE_ERR_INVALID_PARAMS;
goto response;
}

psm = sys_le16_to_cpu(req->psm);
mtu = sys_le16_to_cpu(req->mtu);
mps = sys_le16_to_cpu(req->mps);
Expand All @@ -1133,6 +1140,8 @@ static void le_ecred_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
goto response;
}

memset(dcid, 0, sizeof(dcid));

while (buf->len >= sizeof(scid)) {
scid = net_buf_pull_le16(buf);

Expand All @@ -1144,28 +1153,20 @@ static void le_ecred_conn_req(struct bt_l2cap *l2cap, uint8_t ident,
dcid[i++] = sys_cpu_to_le16(ch->rx.cid);
continue;
/* Some connections refused – invalid Source CID */
case BT_L2CAP_LE_ERR_INVALID_SCID:
/* Some connections refused – Source CID already allocated */
case BT_L2CAP_LE_ERR_SCID_IN_USE:
/* Some connections refused – not enough resources
* available.
*/
default:
/* If a Destination CID is 0x0000, the channel was not
* established.
*/
dcid[i++] = 0x0000;
continue;
/* Some connections refused – not enough resources
* available.
*/
case BT_L2CAP_LE_ERR_NO_RESOURCES:
default:
goto response;
}
}

response:
if (!i) {
i = buf->len / sizeof(scid);
}

buf = l2cap_create_le_sig_pdu(buf, BT_L2CAP_ECRED_CONN_RSP, ident,
sizeof(*rsp) + (sizeof(scid) * i));

Expand Down