Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96347e77 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

posix timers: release_posix_timer: kill the bogus put_task_struct(->it_process); 



release_posix_timer() can't be called with ->it_process != NULL.  Once
sys_timer_create() sets ->it_process it must not call
release_posix_timer(), otherwise we can race with another thread doing
sys_timer_delete(), this timer is visible to idr_find() and unlocked.

The same is true for two other callers (actually, for any possible
caller), sys_timer_delete() and itimer_delete().  They must clear
->it_process before unlock_timer() + release_posix_timer().

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b7a1304

kernel/posix-timers.c

+0 −3
Original line number Diff line number Diff line
@@ -449,9 +449,6 @@ static void release_posix_timer(struct k_itimer *tmr, int it_id_set) 
		spin_unlock_irqrestore(&idr_lock, flags);

	}

	sigqueue_free(tmr->sigq);

	if (unlikely(tmr->it_process) &&

	    tmr->it_sigev_notify == (SIGEV_SIGNAL|SIGEV_THREAD_ID))

		put_task_struct(tmr->it_process);

	kmem_cache_free(posix_timers_cache, tmr);

}