Skip to content

Commit

Permalink
sys/event: fix race in event_wait_multi()
Browse files Browse the repository at this point in the history
We need to clear `event->next` while IRQs are still disabled to
avoid another thread from calling `event_cancel()` just in-between.
  • Loading branch information
maribu committed Dec 17, 2024
1 parent e930e7a commit f1a1ba7
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions sys/event/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

if (result != NULL) {
result->list_node.next = NULL;
irq_restore(state);
return result;
}
} while (result == NULL);

result->list_node.next = NULL;
return result;
irq_restore(state);
thread_flags_wait_any(THREAD_FLAG_EVENT);
}
}

#if IS_USED(MODULE_XTIMER) || IS_USED(MODULE_ZTIMER)
Expand Down

0 comments on commit f1a1ba7

Please sign in to comment.