Skip to content

[backport v3.7-branch] bluetooth: host: hci_core: add missing NULL check #85299

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 2 commits into from
Feb 21, 2025
Merged

[backport v3.7-branch] bluetooth: host: hci_core: add missing NULL check #85299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
050e79e
bluetooth: host: hci_core: add missing `NULL` check
JordanYates Feb 5, 2025
7cddd47
bluetooth: increment `BT_BUF_CMD_TX_COUNT`
JordanYates Feb 6, 2025
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
1 change: 1 addition & 0 deletions subsys/bluetooth/common/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ config BT_BUF_CMD_TX_SIZE

config BT_BUF_CMD_TX_COUNT
int "Number of HCI command buffers"
default 3 if BT_EXT_ADV && BT_CENTRAL
Copy link
Contributor

@cvinayak cvinayak Feb 6, 2025

Choose a reason for hiding this comment

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

Just leaving a comment here that le_ext_adv_param_set uses 2 HCI Command Buffers in a nested format, starving the connection create cancel when invoked from system work queue to fail silently (This can happen if a pre-emptive thread is starting advertising).

The nested use of HCI Command Buffers will be fixed in b21c386

default 2
range 2 64
help
Expand Down
3 changes: 3 additions & 0 deletions subsys/bluetooth/host/hci_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,9 @@ int bt_le_create_conn_cancel(void)
struct bt_hci_cmd_state_set state;

buf = bt_hci_cmd_create(BT_HCI_OP_LE_CREATE_CONN_CANCEL, 0);
if (!buf) {
return -ENOBUFS;
}

bt_hci_cmd_state_set_init(buf, &state, bt_dev.flags,
BT_DEV_INITIATING, false);
Expand Down