posix-timers: check ->it_signal instead of ->it_pid to validate the timer
PATCH 2/2 posix-timers: check ->it_signal instead of ->it_pid to validate the timer
->it_pid (was ->it_process) has also a special meaning: if it is NULL, the timer is under deletion or it wasn't initialized yet. We can check ->it_signal != NULL instead, this way we can
- simplify sys_timer_create() a bit
- remove yet another check from lock_timer()
- move put_pid(->it_pid) into release_posix_timer() which runs outside of ->it_lock
Signed-off-by Oleg Nesterov <[email protected]>
kernel/posix-timers.c renamed from kernel/posix-timers.c~12_USE_SIGNAL_MORE +7 -10
@@ -449,6 +449,7 @@ static void release_posix_timer(struct kidr_remove (&posix_timers_id, tmr->it_id);spin_unlock_irqrestore (&idr_lock, flags); } +put_pid (tmr->it_pid);sigqueue_free (tmr->sigq);kmem_cache_free (posix_timers_cache, tmr); }
@@ -465,7 +466,6 @@ sys_timer_create(const clockid_t which_cint new_timer_id;sigevent_t event;int it_id_set =IT_ID_NOT_SET ; -struct pid *it_pid;if (invalid_clockid (which_clock))return -EINVAL ;
@@ -517,9 +517,9 @@ sys_timer_create(const clockid_t which_c goto out; }rcu_read_lock (); - it_pid =get_pid (good_sigevent (&event)); + new_timer->it_pid =get_pid (good_sigevent (&event));rcu_read_unlock (); -if (!it_pid) { +if (!new_timer->it_pid) { error = -EINVAL ; goto out; }
@@ -527,7 +527,7 @@ sys_timer_create(const clockid_t which_c event.sigev_notify =SIGEV_SIGNAL ; event.sigev_signo =SIGALRM ; event.sigev_value.sival_int = new_timer->it_id; - it_pid =get_pid (task_tgid (current)); + new_timer->it_pid =get_pid (task_tgid (current)); } new_timer->it_sigev_notify = event.sigev_notify;
@@ -537,7 +537,6 @@ sys_timer_create(const clockid_t which_c new_timer->sigq->info.si_code =SI_TIMER ;spin_lock_irq (¤t->sighand->siglock); - new_timer->it_pid = it_pid; new_timer->it_signal = current->signal;list_add (&new_timer->list, ¤t->signal->posix_timers);spin_unlock_irq (¤t->sighand->siglock);
@@ -573,7 +572,7 @@ static struct k_itimer *lock_timer(timer timr =idr_find (&posix_timers_id, (int )timer_id);if (timr) {spin_lock (&timr->it_lock); -if (timr->it_pid && timr->it_signal == current->signal) { +if (timr->it_signal == current->signal) {spin_unlock (&idr_lock);return timr; }
@@ -822,8 +821,7 @@ retry_delete:* This keeps any tasks waiting on the spin lock from thinking * they got something (see the lock code above). */ -put_pid (timer->it_pid); - timer->it_pid =NULL ; + timer->it_signal =NULL ;unlock_timer (timer, flags);release_posix_timer (timer,IT_ID_SET );
@@ -849,8 +847,7 @@ retry_delete:* This keeps any tasks waiting on the spin lock from thinking * they got something (see the lock code above). */ -put_pid (timer->it_pid); - timer->it_pid =NULL ; + timer->it_signal =NULL ;unlock_timer (timer, flags);release_posix_timer (timer,IT_ID_SET );