len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-24 15:31:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improvement to O.F. protections (#75)

Browse source 
* Added protection for xQueueGenericCreate

* prevent eventual invalid state change from int8 overflow

* Append period at end of comment. To be consistent with file.

* check operand, not destination

* parantheses -- to not show assumptive precendence

* Per request, less dependence on stdint by defining and checking against queueINT8_MAX instead
This commit is contained in:
David Chalco 2020-06-30 11:03:30 -07:00 committed by GitHub
parent b47ca712d8
commit 4a61f9ff7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
queue.c
View file

@ -51,6 +51,7 @@ correct privileged Vs unprivileged linkage and placement. */
/* Constants used with the cRxLock and cTxLock structure members. */
#define queueUNLOCKED ( ( int8_t ) -1 )
#define queueLOCKED_UNMODIFIED ( ( int8_t ) 0 )
#define queueINT8_MAX ( ( int8_t ) 127 )
/* When the Queue_t structure is used to represent a base queue its pcHead and
pcTail members are used as pointers into the queue storage area. When the
@ -378,6 +379,9 @@ Queue_t * const pxQueue = xQueue;
zero in the case the queue is used as a semaphore. */
xQueueSizeInBytes = ( size_t ) ( uxQueueLength * uxItemSize ); /*lint !e961 MISRA exception as the casts are only redundant for some ports. */
/* Check for multiplication overflow. */
configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) );
/* Allocate the queue and storage area. Justification for MISRA
deviation as follows: pvPortMalloc() always ensures returned memory
blocks are aligned per the requirements of the MCU stack. In this case
@ -1092,6 +1096,8 @@ Queue_t * const pxQueue = xQueue;
{
/* Increment the lock count so the task that unlocks the queue
knows that data was posted while it was locked. */
configASSERT( cTxLock != queueINT8_MAX);
pxQueue->cTxLock = ( int8_t ) ( cTxLock + 1 );
}
@ -1257,6 +1263,8 @@ Queue_t * const pxQueue = xQueue;
{
/* Increment the lock count so the task that unlocks the queue
knows that data was posted while it was locked. */
configASSERT( cTxLock != queueINT8_MAX);
pxQueue->cTxLock = ( int8_t ) ( cTxLock + 1 );
}
@ -1856,6 +1864,8 @@ Queue_t * const pxQueue = xQueue;
{
/* Increment the lock count so the task that unlocks the queue
knows that data was removed while it was locked. */
configASSERT( cRxLock != queueINT8_MAX);
pxQueue->cRxLock = ( int8_t ) ( cRxLock + 1 );
}
@ -2919,6 +2929,8 @@ Queue_t * const pxQueue = xQueue;
}
else
{
configASSERT( cTxLock != queueINT8_MAX);
pxQueueSetContainer->cTxLock = ( int8_t ) ( cTxLock + 1 );
}
}