posix-timers: fix creation race
PATCH 2/4 posix-timers: fix creation race
sys_timer_create() sets ->it_process and unlocks ->siglock, then checks tmr->it_sigev_notify to define if get_task_struct() is needed.
We already passed ->it_id to the caller, another thread can delete this timer and free its memory in between.
As a minimal fix, move this code under ->siglock, sys_timer_delete() takes it too before calling release_posix_timer(). A proper serialization would be to take ->it_lock, we add a partly initialized timer on posix_timers_id, not good.
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +1 -2
@@ -547,13 +547,12 @@ sys_timer_create(const clockid_t which_c new_timer->it_process = process;list_add (&new_timer->list, &process->signal->posix_timers); -spin_unlock_irqrestore (&process->sighand->siglock, flags);if (new_timer->it_sigev_notify == (SIGEV_SIGNAL |SIGEV_THREAD_ID ))get_task_struct (process); }else { -spin_unlock_irqrestore (&process->sighand->siglock, flags); process =NULL ; } +spin_unlock_irqrestore (&process->sighand->siglock, flags); }read_unlock (&tasklist_lock);if (!process) {
Quoted 6 lines · Oleg Nesterov
sys_timer_create()sets ->it_process and unlocks ->siglock, then checkstmr->it_sigev_notifyto define ifget_task_struct()is needed.We already passed ->it_id to the caller, another thread can delete this timer and free its memory in between.
Quoted 6 lines
As a minimal fix, move this code under ->siglock,
sys_timer_delete()takes it too before callingrelease_posix_timer(). A proper serialization would be to take ->it_lock, we add a partly initialized timer onposix_timers_id, not good.Signed-off-by Oleg Nesterov <[email protected]>
Quoted 18 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +1
-2@@ -547,13 +547,12 @@ sys_timer_create(const clockid_t which_c new_timer->it_process = process;list_add (&new_timer->list, &process->signal->posix_timers); -spin_unlock_irqrestore (&process->sighand->siglock, flags);if (new_timer->it_sigev_notify == (SIGEV_SIGNAL |SIGEV_THREAD_ID ))get_task_struct (process); }else { -spin_unlock_irqrestore (&process->sighand->siglock, flags); process =NULL ; } +spin_unlock_irqrestore (&process->sighand->siglock, flags); }read_unlock (&tasklist_lock);if (!process) {
Quoted 8 lines · Thomas Gleixner
Quoted 6 lines · Oleg Nesterov
sys_timer_create()sets ->it_process and unlocks ->siglock, then checkstmr->it_sigev_notifyto define ifget_task_struct()is needed.We already passed ->it_id to the caller, another thread can delete this timer and free its memory in between.
Quoted 8 lines
Quoted 6 lines
As a minimal fix, move this code under ->siglock,
sys_timer_delete()takes it too before callingrelease_posix_timer(). A proper serialization would be to take ->it_lock, we add a partly initialized timer onposix_timers_id, not good.Signed-off-by Oleg Nesterov <[email protected]>Acked-by Thomas Gleixner <[email protected]>
Oooh, thanks, but...
Quoted 6 lines
Quoted 6 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +0
-0@@ -547,13 +547,12 @@ sys_timer_create(const clockid_t which_c new_timer->it_process = process;list_add (&new_timer->list, &process->signal->posix_timers);
Quoted 8 lines
kernel/posix-timers.c sys_timer_create(const clockid_t which_c · line 555
Quoted 8 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +1
-2-spin_unlock_irqrestore (&process->sighand->siglock, flags);if (new_timer->it_sigev_notify == (SIGEV_SIGNAL |SIGEV_THREAD_ID ))get_task_struct (process); }else { -spin_unlock_irqrestore (&process->sighand->siglock, flags); process =NULL ; } +spin_unlock_irqrestore (&process->sighand->siglock, flags);
i'll resend this patch tomorrow. We can't do spin_unlock_irqrestore(&process->...) if we set process = NULL above.
This all needs a cleanup anyway. The PF_EXITING check and related comment are bogus.
Other patches do not depend on this one.
Oleg.
Quoted 8 lines · Oleg Nesterov
Quoted 5 lines
Review
Quoted 5 lines
(quoted diff) +1
-1- spin_unlock_irqrestore(&process->sighand->siglock, flags); process = NULL; } + spin_unlock_irqrestore(&process->sighand->siglock, flags);i'll resend this patch tomorrow. We can't do
spin_unlock_irqrestore(&process->...)if we set process = NULL above.
Another attempt, no cleanups, just a minimal fix for now.
[PATCH 2/4] posix-timers: fix creation race
sys_timer_create() sets ->it_process and unlocks ->siglock, then checks tmr->it_sigev_notify to define if get_task_struct() is needed.
We already passed ->it_id to the caller, another thread can delete this timer and free its memory in between.
As a minimal fix, move this code under ->siglock, sys_timer_delete() takes it too before calling release_posix_timer(). A proper serialization would be to take ->it_lock, we add a partly initialized timer on posix_timers_id, not good.
kernel/posix-timers.c renamed from kernel/posix-timers.c~ +1 -1
@@ -547,9 +547,9 @@ sys_timer_create(const clockid_t which_c new_timer->it_process = process;list_add (&new_timer->list, &process->signal->posix_timers); -spin_unlock_irqrestore (&process->sighand->siglock, flags);if (new_timer->it_sigev_notify == (SIGEV_SIGNAL |SIGEV_THREAD_ID ))get_task_struct (process); +spin_unlock_irqrestore (&process->sighand->siglock, flags); }else {spin_unlock_irqrestore (&process->sighand->siglock, flags); process =NULL ;
Quoted 9 lines · Oleg Nesterov
Quoted 9 lines
Quoted 9 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +0
-1@@ -547,13 +547,12 @@ sys_timer_create(const clockid_t which_c new_timer->it_process = process;list_add (&new_timer->list, &process->signal->posix_timers); -spin_unlock_irqrestore (&process->sighand->siglock, flags);if (new_timer->it_sigev_notify == (SIGEV_SIGNAL |SIGEV_THREAD_ID ))get_task_struct (process);
Quoted 8 lines
Quoted 5 lines
kernel/posix-timers.c sys_timer_create(const clockid_t which_c · line 555
Quoted 5 lines
kernel/posix-timers.c renamed from kernel/posix-timers.c~2_CREATE +1
-1}else { -spin_unlock_irqrestore (&process->sighand->siglock, flags); process =NULL ; } +spin_unlock_irqrestore (&process->sighand->siglock, flags);i'll resend this patch tomorrow. We can't do
spin_unlock_irqrestore(&process->...)if we set process = NULL above.
Doh, half of my brain seems to be still on vacation.
tglx