lkml.org 
[lkml]   [2003]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [BUG] 2.5.62 kmod rewrite broke modprobe's install command
On Mon, 24 Feb 2003 13:52:18 +1100, Rusty Russell wrote:
>--- linux-2.5.62-bk6/kernel/kmod.c 2003-02-18 11:18:57.000000000 +1100
>+++ working-2.5.62-bk6-usermode-sig/kernel/kmod.c 2003-02-24 12:18:55.000000000 +1100
>@@ -152,6 +152,14 @@ static int ____call_usermodehelper(void
> struct subprocess_info *sub_info = data;
> int retval;
>
>+ /* Unblock all signals. */
>+ flush_signals(curtask);
>+ flush_signal_handlers(curtask);
>+ spin_lock_irq(&curtask->sighand->siglock);
>+ sigemptyset(&curtask->blocked);
>+ recalc_sigpending();
>+ spin_unlock_irq(&curtask->sighand->siglock);
>+
> retval = -EPERM;
> if (current->fs->root)
> retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
>

Doesn't compile (curtask undeclared) and doesn't work (SIGCHLD is
still SIG_IGN causing system() to fail). The problem is that
kernel/workqueue.c:worker_thread() [which is what runs modprobe now]
sets SIGCHLD to SIG_IGN, and your patch doesn't unbreak that.

The patch below, applied on top of your patch, makes it work for me.

/Mikael

--- linux-2.5.62/kernel/kmod.c.~2~ 2003-02-24 12:39:01.000000000 +0100
+++ linux-2.5.62/kernel/kmod.c 2003-02-24 13:27:51.000000000 +0100
@@ -150,10 +150,12 @@
static int ____call_usermodehelper(void *data)
{
struct subprocess_info *sub_info = data;
+ struct task_struct *curtask = current;
int retval;

/* Unblock all signals. */
flush_signals(curtask);
+ curtask->sighand->action[SIGCHLD-1].sa.sa_handler = SIG_DFL;
flush_signal_handlers(curtask);
spin_lock_irq(&curtask->sighand->siglock);
sigemptyset(&curtask->blocked);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:33    [W:0.019 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site