Skip to content

host: prevent timing issue if indication ack is received before proc being inserted #2011

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

host: prevent timing issue if indication ack is received before proc being inserted #2011

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af63c93
host: prevent timing issue if indication ack is received before proc …
DamienEspitallier Mar 14, 2025
907340b
fix: coding style
DamienEspitallier Mar 20, 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
32 changes: 25 additions & 7 deletions nimble/host/src/ble_gattc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,16 @@ ble_gattc_proc_matches_conn_rx_entry(struct ble_gattc_proc *proc, void *arg)
return (criteria->matching_rx_entry != NULL);
}

static int
ble_gattc_proc_equals(struct ble_gattc_proc *proc, void *arg)
{
struct ble_gattc_proc *criteria;

criteria = arg;

return proc == criteria;
}

static void
ble_gattc_extract(ble_gattc_match_fn *cb, void *arg, int max_procs,
struct ble_gattc_proc_list *dst_list)
Expand Down Expand Up @@ -4687,12 +4697,6 @@ ble_gatts_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
}
}

rc = ble_att_clt_tx_indicate(conn_handle, proc->cid, chr_val_handle, txom);
txom = NULL;
if (rc != 0) {
goto done;
}

ble_hs_lock();
conn = ble_hs_conn_find(conn_handle);
if (conn != NULL) {
Expand All @@ -4701,6 +4705,14 @@ ble_gatts_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
}
ble_hs_unlock();

ble_gattc_process_status(proc, 0);

rc = ble_att_clt_tx_indicate(conn_handle, proc->cid, chr_val_handle, txom);
txom = NULL;
if (rc != 0) {
goto done;
}

done:
if (rc != 0) {
STATS_INC(ble_gattc_stats, indicate_fail);
Expand All @@ -4709,7 +4721,13 @@ ble_gatts_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
/* Tell the application that an indication transmission was attempted. */
ble_gap_notify_tx_event(rc, conn_handle, chr_val_handle, 1);

ble_gattc_process_status(proc, rc);
if (rc != 0) {
//remove the proc if tx failed
ble_gattc_extract_one(ble_gattc_proc_equals, proc);
if (proc != NULL) {
ble_gattc_process_status(proc, rc);
}
}
os_mbuf_free_chain(txom);
return rc;
}
Expand Down
Loading