ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Fix incorrect index used to access attsCb.prepWriteQueue in Cordio 

The connection id starts at the value 1. The entry accessed in the array should be connId - 1
pull/13785/head
Vincent Coubard 2020-10-19 17:21:49 +01:00
parent 8d9dabe925
commit 542b725545
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/sources/stack/att/atts_main.c
View File

@ -366,7 +366,7 @@ void attsClearPrepWrites(attsCcb_t *pCcb)
{ {
void *pBuf; void *pBuf;
while ((pBuf = WsfQueueDeq(&attsCb.prepWriteQueue[pCcb->connId])) != NULL) while ((pBuf = WsfQueueDeq(&attsCb.prepWriteQueue[pCcb->connId - 1])) != NULL)
{ {
WsfBufFree(pBuf); WsfBufFree(pBuf);
} }

8
connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/sources/stack/att/atts_write.c
View File

@ -265,7 +265,7 @@ void attsProcPrepWriteReq(attsCcb_t *pCcb, uint16_t len, uint8_t *pPacket)
err = ATT_ERR_LENGTH; err = ATT_ERR_LENGTH;
} }
/* verify prepare write queue limit not reached */ /* verify prepare write queue limit not reached */
else if (WsfQueueCount(&attsCb.prepWriteQueue[pCcb->connId]) >= pAttCfg->numPrepWrites) else if (WsfQueueCount(&attsCb.prepWriteQueue[pCcb->connId - 1]) >= pAttCfg->numPrepWrites)
{ {
err = ATT_ERR_QUEUE_FULL; err = ATT_ERR_QUEUE_FULL;
} }
@ -288,7 +288,7 @@ void attsProcPrepWriteReq(attsCcb_t *pCcb, uint16_t len, uint8_t *pPacket)
pPrep->handle = handle; pPrep->handle = handle;
pPrep->offset = offset; pPrep->offset = offset;
memcpy(pPrep->packet, pPacket, writeLen); memcpy(pPrep->packet, pPacket, writeLen);
WsfQueueEnq(&attsCb.prepWriteQueue[pCcb->connId], pPrep); WsfQueueEnq(&attsCb.prepWriteQueue[pCcb->connId - 1], pPrep);
/* allocate response buffer */ /* allocate response buffer */
if ((pBuf = attMsgAlloc(L2C_PAYLOAD_START + ATT_PREP_WRITE_RSP_LEN + writeLen)) != NULL) if ((pBuf = attMsgAlloc(L2C_PAYLOAD_START + ATT_PREP_WRITE_RSP_LEN + writeLen)) != NULL)
@ -342,7 +342,7 @@ void attsProcExecWriteReq(attsCcb_t *pCcb, uint16_t len, uint8_t *pPacket)
else if (*pPacket == ATT_EXEC_WRITE_ALL) else if (*pPacket == ATT_EXEC_WRITE_ALL)
{ {
/* iterate over prepare write queue and verify offset and length */ /* iterate over prepare write queue and verify offset and length */
for (pPrep = attsCb.prepWriteQueue[pCcb->connId].pHead; pPrep != NULL; pPrep = pPrep->pNext) for (pPrep = attsCb.prepWriteQueue[pCcb->connId - 1].pHead; pPrep != NULL; pPrep = pPrep->pNext)
{ {
/* find attribute */ /* find attribute */
if ((pAttr = attsFindByHandle(pPrep->handle, &pGroup)) != NULL) if ((pAttr = attsFindByHandle(pPrep->handle, &pGroup)) != NULL)
@ -371,7 +371,7 @@ void attsProcExecWriteReq(attsCcb_t *pCcb, uint16_t len, uint8_t *pPacket)
if (err == ATT_SUCCESS) if (err == ATT_SUCCESS)
{ {
/* for each buffer */ /* for each buffer */
while ((pPrep = WsfQueueDeq(&attsCb.prepWriteQueue[pCcb->connId])) != NULL) while ((pPrep = WsfQueueDeq(&attsCb.prepWriteQueue[pCcb->connId - 1])) != NULL)
{ {
/* write buffer */ /* write buffer */
if ((err = attsExecPrepWrite(pCcb, pPrep)) != ATT_SUCCESS) if ((err = attsExecPrepWrite(pCcb, pPrep)) != ATT_SUCCESS)