Skip to content

nimble/host: Fix handle validation in Read Mult Response #2288

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
piotrnarajowski wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

nimble/host: Fix handle validation in Read Mult Response #2288

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: 12 additions & 3 deletions nimble/host/src/ble_att_svr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,10 +1641,9 @@ ble_att_svr_build_read_mult_rsp(uint16_t conn_handle, uint16_t cid,
}

/* Iterate through requested handles, reading the corresponding attribute
* for each. Stop when there are no more handles to process, or the
* response is full.
* for each. Stop when there are no more handles to process.
*/
while (OS_MBUF_PKTLEN(*rxom) >= 2 && OS_MBUF_PKTLEN(txom) < mtu) {
while (OS_MBUF_PKTLEN(*rxom) >= 2) {
/* Ensure the full 16-bit handle is contiguous at the start of the
* mbuf.
*/
Expand All @@ -1667,9 +1666,19 @@ ble_att_svr_build_read_mult_rsp(uint16_t conn_handle, uint16_t cid,
}
}

/* Concatenated values should not exceed ATT_MTU - 1 octets */
if (OS_MBUF_PKTLEN(txom) > mtu) {
os_mbuf_adj(txom, mtu - OS_MBUF_PKTLEN(txom));
}

rc = 0;

done:
if (rc != 0 && txom != NULL) {
os_mbuf_free_chain(txom);
txom = NULL;
}

*out_txom = txom;
return rc;
}
Expand Down
Loading