Skip to content

nimble/transport: Fix double free in hci_h4_sm_completed() #2266

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

Open
94xhn wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

nimble/transport: Fix double free in hci_h4_sm_completed() #2266

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
15 changes: 11 additions & 4 deletions nimble/transport/common/hci_h4/src/hci_h4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,17 @@ hci_h4_sm_completed(struct hci_h4_sm *h4sm)
case HCI_H4_ISO:
if (h4sm->om) {
assert(h4sm->frame_cb);
rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->om);
if (rc != 0) {
os_mbuf_free_chain(h4sm->om);
}
/*
* Unlike the HCI_H4_CMD/HCI_H4_EVT case above, frame_cb() always
* takes ownership of h4sm->om here, regardless of the status it
* returns. For the LL->HS direction (e.g. apollo3, dialog_cmac,
* uart_ll) frame_cb() forwards to ble_transport_to_hs_acl(),
* which reaches ble_hs_rx_data(); that function is documented to
* consume the supplied mbuf "regardless of the outcome" and
* already frees it on failure. Freeing h4sm->om again here would
* be a double free, so just propagate the status instead.
*/
h4sm->frame_cb(h4sm->pkt_type, h4sm->om);
h4sm->om = NULL;
}
break;
Expand Down
Loading