Skip to content

Cordio BLE: ignore messages with overlong headers (CVE-2024-48986) #385

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 1 commit into from
Nov 23, 2024
Merged

Cordio BLE: ignore messages with overlong headers (CVE-2024-48986) #385

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
4 changes: 3 additions & 1 deletion connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/sources/hci/dual_chip/hci_evt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,6 +2738,7 @@ void hciEvtProcessMsg(uint8_t *pEvt)
uint8_t evt;
uint8_t subEvt;
uint8_t len;
uint8_t extraMsgLen = 0;
uint8_t cbackEvt = 0;
hciEvt_t *pMsg;
uint16_t handle;
Expand Down Expand Up @@ -2997,6 +2998,7 @@ void hciEvtProcessMsg(uint8_t *pEvt)
#endif
hciEvtStats.numVendorSpecEvt++;
cbackEvt = HCI_VENDOR_SPEC_CBACK_EVT;
extraMsgLen = len;

#ifdef WSF_DETOKEN_TRACE
if (WsfDetokenProcessHciEvent(len, pEvt))
Expand All @@ -3014,7 +3016,7 @@ void hciEvtProcessMsg(uint8_t *pEvt)
if (cbackEvt != 0)
{
/* allocate temp buffer */
if ((pMsg = WsfBufAlloc(hciEvtCbackLen[cbackEvt])) != NULL)
if ((pMsg = WsfBufAlloc(hciEvtCbackLen[cbackEvt] + extraMsgLen)) != NULL)
{
/* initialize message header */
pMsg->hdr.param = 0;
Expand Down