Embedded/threadx
1
0
Fork 0
mirror of https://github.com/azure-rtos/threadx synced 2025-01-30 08:02:57 +08:00
Code Issues Releases Wiki Activity

Add check for overflow in queue size calculation in RTOS compatibility layer. (#339)

Browse Source 
* Add check for overflow in queue size calculation.

* Update release data and version.
This commit is contained in:
Xiuwen Cai 2023-12-28 13:17:40 +08:00 committed by GitHub
parent d9ffb0f97d
commit 9f3e35d3dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utility/rtos_compatibility_layers/FreeRTOS/tx_freertos.c
View File

@ -33,6 +33,10 @@
/* start flag, corrected stack */ /* start flag, corrected stack */
/* allocation size, */ /* allocation size, */
/* resulting in version 6.1.12 */ /* resulting in version 6.1.12 */
/* 12-31-2023 Xiuwen Cai Modified comment(s), and */
/* added check for overflow in */
/* queue size calculation, */
/* resulting in version 6.4.0 */
/* */ /* */
/**************************************************************************/ /**************************************************************************/
@ -1526,6 +1530,13 @@ QueueHandle_t xQueueCreate(UBaseType_t uxQueueLength, UBaseType_t uxItemSize)
} }
#endif #endif
if ((uxQueueLength > (SIZE_MAX / uxItemSize)) ||
(uxQueueLength > (ULONG_MAX / uxItemSize))) {
/* Integer overflow in queue size */
return NULL;
}
p_queue = txfr_malloc(sizeof(txfr_queue_t)); p_queue = txfr_malloc(sizeof(txfr_queue_t));
if(p_queue == NULL) { if(p_queue == NULL) {
return NULL; return NULL;
@ -2692,6 +2703,13 @@ QueueSetHandle_t xQueueCreateSet(const UBaseType_t uxEventQueueLength)
} }
#endif #endif
if ((uxEventQueueLength > (SIZE_MAX / sizeof(void *))) ||
(uxEventQueueLength > (ULONG_MAX / sizeof(void *)))) {
/* Integer overflow in queue size */
return NULL;
}
p_set = txfr_malloc(sizeof(txfr_queueset_t)); p_set = txfr_malloc(sizeof(txfr_queueset_t));
if(p_set == NULL) { if(p_set == NULL) {
return NULL; return NULL;