From 53876ab402e2d1f566c052ab1be45680f2f69949 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 23 Feb 2003 17:40:38 -0800 Subject: Add support for forcing default signal handlers to flush_signal_handlers(). Make kmod force default handlers before executing the user process. --- kernel/kmod.c | 2 +- kernel/signal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel') diff --git a/kernel/kmod.c b/kernel/kmod.c index 01c18cacc58b..971fc7438a6b 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -155,7 +155,7 @@ static int ____call_usermodehelper(void *data) /* Unblock all signals. */ flush_signals(current); spin_lock_irq(¤t->sighand->siglock); - flush_signal_handlers(current); + flush_signal_handlers(current, 1); sigemptyset(¤t->blocked); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); diff --git a/kernel/signal.c b/kernel/signal.c index 0f64a3867736..49e483f8451e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -356,12 +356,12 @@ void exit_signal(struct task_struct *tsk) */ void -flush_signal_handlers(struct task_struct *t) +flush_signal_handlers(struct task_struct *t, int force_default) { int i; struct k_sigaction *ka = &t->sighand->action[0]; for (i = _NSIG ; i != 0 ; i--) { - if (ka->sa.sa_handler != SIG_IGN) + if (force_default || ka->sa.sa_handler != SIG_IGN) ka->sa.sa_handler = SIG_DFL; ka->sa.sa_flags = 0; sigemptyset(&ka->sa.sa_mask); -- cgit v1.2.3