RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

core/sched.c: fix undefined behavior on 8-bit/16-bit

Browse Source 
An `1 << x` with `x >= 15` is undefined behavior on 8-bit / 16-bit
machines (which typically have `sizeof(int) == 2`).

Using `1UL << x` is safe for `x <= 31`, which is large enough to make
use of the full 32 bits in `runqueue_bitcache`.

In addition, a `static_assert()` is added to enforce that
`SCHED_PRIO_LEVELS` is never set to anything larger than 32.
This commit is contained in:
Marian Buschsieweke 2022-09-09 21:24:11 +02:00
parent 1066195fe9
commit d53cd19142
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/sched.c
View File

@ -23,12 +23,13 @@
#include <stdint.h> #include <stdint.h>
#include <inttypes.h> #include <inttypes.h>
#include "sched.h" #include "assert.h"
#include "clist.h"
#include "bitarithm.h" #include "bitarithm.h"
#include "clist.h"
#include "irq.h" #include "irq.h"
#include "thread.h"
#include "log.h" #include "log.h"
#include "sched.h"
#include "thread.h"
#ifdef MODULE_MPU_STACK_GUARD #ifdef MODULE_MPU_STACK_GUARD
#include "mpu.h" #include "mpu.h"
@ -58,6 +59,8 @@ volatile kernel_pid_t sched_active_pid = KERNEL_PID_UNDEF;
volatile thread_t *sched_threads[KERNEL_PID_LAST + 1]; volatile thread_t *sched_threads[KERNEL_PID_LAST + 1];
volatile int sched_num_threads = 0; volatile int sched_num_threads = 0;
static_assert(SCHED_PRIO_LEVELS <= 32, "SCHED_PRIO_LEVELS may at most be 32");
FORCE_USED_SECTION FORCE_USED_SECTION
const uint8_t max_threads = ARRAY_SIZE(sched_threads); const uint8_t max_threads = ARRAY_SIZE(sched_threads);
@ -92,7 +95,7 @@ static inline void _set_runqueue_bit(uint8_t priority)
#if defined(BITARITHM_HAS_CLZ) #if defined(BITARITHM_HAS_CLZ)
runqueue_bitcache |= BIT31 >> priority; runqueue_bitcache |= BIT31 >> priority;
#else #else
runqueue_bitcache |= 1 << priority; runqueue_bitcache |= 1UL << priority;
#endif #endif
} }
@ -101,7 +104,7 @@ static inline void _clear_runqueue_bit(uint8_t priority)
#if defined(BITARITHM_HAS_CLZ) #if defined(BITARITHM_HAS_CLZ)
runqueue_bitcache &= ~(BIT31 >> priority); runqueue_bitcache &= ~(BIT31 >> priority);
#else #else
runqueue_bitcache &= ~(1 << priority); runqueue_bitcache &= ~(1UL << priority);
#endif #endif
} }