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

posix timers: discard SI_TIMER signals on exec 

Based on Roland's patch. This approach was suggested by Austin Clements
from the very beginning, and then by Linus.

As Austin pointed out, the execing task can be killed by SI_TIMER signal
because exec flushes the signal handlers, but doesn't discard the pending
signals generated by posix timers. Perhaps not a bug, but people find this
surprising. See http://bugzilla.kernel.org/show_bug.cgi?id=10460



Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Austin Clements <amdragon+kernelbugzilla@mit.edu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8e85b4f

fs/exec.c

+1 −0
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ static int de_thread(struct task_struct *tsk) 


no_thread_group:

	exit_itimers(sig);

	flush_itimer_signals();

	if (leader)

		release_task(leader);

include/linux/sched.h

+2 −0
Original line number Diff line number Diff line
@@ -1848,7 +1848,9 @@ extern void exit_thread(void); 
extern void exit_files(struct task_struct *);

extern void __cleanup_signal(struct signal_struct *);

extern void __cleanup_sighand(struct sighand_struct *);



extern void exit_itimers(struct signal_struct *);

extern void flush_itimer_signals(void);



extern NORET_TYPE void do_group_exit(int);

kernel/signal.c

+34 −0
Original line number Diff line number Diff line
@@ -231,6 +231,40 @@ void flush_signals(struct task_struct *t) 
	spin_unlock_irqrestore(&t->sighand->siglock, flags);

}



static void __flush_itimer_signals(struct sigpending *pending)

{

	sigset_t signal, retain;

	struct sigqueue *q, *n;



	signal = pending->signal;

	sigemptyset(&retain);



	list_for_each_entry_safe(q, n, &pending->list, list) {

		int sig = q->info.si_signo;



		if (likely(q->info.si_code != SI_TIMER)) {

			sigaddset(&retain, sig);

		} else {

			sigdelset(&signal, sig);

			list_del_init(&q->list);

			__sigqueue_free(q);

		}

	}



	sigorsets(&pending->signal, &signal, &retain);

}



void flush_itimer_signals(void)

{

	struct task_struct *tsk = current;

	unsigned long flags;



	spin_lock_irqsave(&tsk->sighand->siglock, flags);

	__flush_itimer_signals(&tsk->pending);

	__flush_itimer_signals(&tsk->signal->shared_pending);

	spin_unlock_irqrestore(&tsk->sighand->siglock, flags);

}



void ignore_signals(struct task_struct *t)

{

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE