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

Merge pull request #21092 from maribu/sys/event/fix-race

Browse Source 
sys/event: fix race in event_wait_multi()
This commit is contained in:
benpicco 2024-12-16 20:22:01 +00:00 committed by GitHub
commit 679ac927b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/event/event.c
View File

@ -90,7 +90,7 @@ event_t *event_wait_multi(event_queue_t *queues, size_t n_queues)
assert(queues && n_queues);
event_t *result = NULL;
do {
while (1) {
unsigned state = irq_disable();
for (size_t i = 0; i < n_queues; i++) {
assert(queues[i].waiter);
@ -100,14 +100,16 @@ event_t *event_wait_multi(event_queue_t *queues, size_t n_queues)
break;
}
}
irq_restore(state);
if (result == NULL) {
thread_flags_wait_any(THREAD_FLAG_EVENT);
}
} while (result == NULL);
result->list_node.next = NULL;
return result;
if (result != NULL) {
result->list_node.next = NULL;
irq_restore(state);
return result;
}
irq_restore(state);
thread_flags_wait_any(THREAD_FLAG_EVENT);
}
}
#if IS_USED(MODULE_XTIMER) || IS_USED(MODULE_ZTIMER)