mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-19 00:51:37 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MAJOR: tasks: make sure to always lock the shared wait queue if needed

Browse Source 
In run_tasks_from_task_list() we may free some tasks that have been
killed. Before doing so we unlink them from the wait queue. But if such
a task is in the global wait queue, the queue isn't locked so this can
result in corrupting the global task list and causing loops or crashes.

It's very likely one cause of issue #758.

This must be backported to 2.2. For 2.1 there doesn't seem to be any
case where a task could be freed this way while in the global queue,
but it doesn't cost much to apply the same change (the code is in
process_runnable_task there).
This commit is contained in:
Willy Tarreau 2020-07-17 14:37:51 +02:00
parent ad37c7ab25
commit 273aea479d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/task.c
View File

@ -476,8 +476,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
else if (!(state & TASK_KILLED) && process != NULL)
t = process(t, ctx, state);
else {
if (task_in_wq(t))
__task_unlink_wq(t);
task_unlink_wq(t);
__task_free(t);
sched->current = NULL;
__ha_barrier_store();
@ -500,8 +499,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
state = _HA_ATOMIC_AND(&t->state, ~TASK_RUNNING);
if (unlikely(state & TASK_KILLED)) {
if (task_in_wq(t))
__task_unlink_wq(t);
task_unlink_wq(t);
__task_free(t);
}
else if (state & TASK_WOKEN_ANY)