len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2026-10-10 08:02:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix undefined behavior in uxSchedulerCoreMask initialization and clamping logic

Browse source
This commit is contained in:
Kuoping Hsu 2026-05-15 20:37:20 +08:00
parent 4f32c359ef
commit 54c3e971da
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tasks.c
View file

@ -515,8 +515,14 @@ PRIVILEGED_DATA static TaskHandle_t xIdleTaskHandles[ configNUMBER_OF_CORES ];
/* Global scheduler core mask. Bit N = 1 means core N is allowed to run /* Global scheduler core mask. Bit N = 1 means core N is allowed to run
* non-idle tasks. Defaults to all cores enabled. Use * non-idle tasks. Defaults to all cores enabled. Use
* vTaskSetSchedulerCoreMask() / uxTaskGetSchedulerCoreMask() to change it * vTaskSetSchedulerCoreMask() / uxTaskGetSchedulerCoreMask() to change it
* at run time. */ * at run time.
PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerCoreMask = ( UBaseType_t ) ( ( 1UL << configNUMBER_OF_CORES ) - 1UL ); *
* The mask is derived by right-shifting ~0 rather than left-shifting 1,
* because left-shifting by a value equal to the type width is undefined
* behaviour in C (C11 §6.5.7). Using UBaseType_t throughout also avoids
* the assumption that unsigned long is at least as wide as UBaseType_t. */
PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerCoreMask =
( ( UBaseType_t ) ( ~( UBaseType_t ) 0U ) >> ( ( sizeof( UBaseType_t ) * ( size_t ) 8U ) - ( size_t ) configNUMBER_OF_CORES ) );
#endif /* #if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_SCHEDULER_CORE_MASK == 1 ) ) */ #endif /* #if ( ( configNUMBER_OF_CORES > 1 ) && ( configUSE_SCHEDULER_CORE_MASK == 1 ) ) */
/* Improve support for OpenOCD. The kernel tracks Ready tasks via priority lists. /* Improve support for OpenOCD. The kernel tracks Ready tasks via priority lists.
@ -3141,8 +3147,12 @@ static void prvInitialiseNewTask( TaskFunction_t pxTaskCode,
{ {
uxOldMask = uxSchedulerCoreMask; uxOldMask = uxSchedulerCoreMask;
/* Clamp to the number of physical cores so stray bits are ignored. */ /* Clamp to the number of physical cores so stray bits are ignored.
uxSchedulerCoreMask = uxCoreMask & ( UBaseType_t ) ( ( 1UL << configNUMBER_OF_CORES ) - 1UL ); * The valid-core mask is derived by right-shifting ~0 to avoid
* left-shift UB and unsigned long width assumptions (see the
* uxSchedulerCoreMask initialiser for a full explanation). */
uxSchedulerCoreMask = uxCoreMask &
( ( UBaseType_t ) ( ~( UBaseType_t ) 0U ) >> ( ( sizeof( UBaseType_t ) * ( size_t ) 8U ) - ( size_t ) configNUMBER_OF_CORES ) );
if( xSchedulerRunning != pdFALSE ) if( xSchedulerRunning != pdFALSE )
{ {