Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index eed53d4..d9b2858 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -120,6 +120,7 @@ struct subprocess_info {
        char *path;
        char **argv;
        char **envp;
+       struct key *ring;
        int wait;
        int retval;
 };
@@ -127,25 +128,46 @@ struct subprocess_info {
 /*
  * This is the task which runs the usermode application
  */
-static int ____call_usermodehelper(void *data)
+int
+__exec_usermodehelper(char *path, char **argv, char **envp, struct key *ring)
 {
-       struct subprocess_info *sub_info = data;
+       struct key *new_session, *old_session;
        int retval;
 
-       /* Unblock all signals. */
+       /* Unblock all signals and set the session keyring. */
+       new_session = key_get(ring);
        flush_signals(current);
        spin_lock_irq(&current->sighand->siglock);
+       old_session = __install_session_keyring(current, new_session);
        flush_signal_handlers(current, 1);
        sigemptyset(&current->blocked);
        recalc_sigpending();
        spin_unlock_irq(&current->sighand->siglock);
 
-       /* We can run anywhere, unlike our parent keventd(). */
-       set_cpus_allowed(current, CPU_MASK_ALL);
+       key_put(old_session);
 
        retval = -EPERM;
        if (current->fs->root)
-               retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
+               retval = execve(path, argv, envp);
+
+       return retval;
+}
+
+EXPORT_SYMBOL_GPL(__exec_usermodehelper);
+
+/*
+ * This is the task which runs the usermode application
+ */
+static int ____call_usermodehelper(void *data)
+{
+       struct subprocess_info *sub_info = data;
+       int retval;
+
+       /* We can run anywhere, unlike our parent keventd(). */
+       set_cpus_allowed(current, CPU_MASK_ALL);
+
+       retval = __exec_usermodehelper(sub_info->path,
+                       sub_info->argv, sub_info->envp, sub_info->ring);
 
        /* Exec failed? */
        sub_info->retval = retval;
@@ -164,7 +186,7 @@ static int wait_for_helper(void *data)
        sa.sa.sa_handler = SIG_IGN;
        sa.sa.sa_flags = 0;
        siginitset(&sa.sa.sa_mask, sigmask(SIGCHLD));
-       do_sigaction(SIGCHLD, &sa, (struct k_sigaction *)0);
+       do_sigaction(SIGCHLD, &sa, NULL);
        allow_signal(SIGCHLD);
 
        pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
@@ -211,10 +233,11 @@ static void __call_usermodehelper(void *data)
 }
 
 /**
- * call_usermodehelper - start a usermode application
+ * call_usermodehelper_keys - start a usermode application
  * @path: pathname for the application
  * @argv: null-terminated argument list
  * @envp: null-terminated environment list
+ * @session_keyring: session keyring for process (NULL for an empty keyring)
  * @wait: wait for the application to finish and return status.
  *
  * Runs a user-space application.  The application is started
@@ -224,7 +247,8 @@ static void __call_usermodehelper(void *data)
  * Must be called from process context.  Returns a negative error code
  * if program was not execed successfully, or 0.
  */
-int call_usermodehelper(char *path, char **argv, char **envp, int wait)
+int call_usermodehelper_keys(char *path, char **argv, char **envp,
+                            struct key *session_keyring, int wait)
 {
        DECLARE_COMPLETION(done);
        struct subprocess_info sub_info = {
@@ -232,6 +256,7 @@ int call_usermodehelper(char *path, char **argv, char **envp, int wait)
                .path           = path,
                .argv           = argv,
                .envp           = envp,
+               .ring           = session_keyring,
                .wait           = wait,
                .retval         = 0,
        };
@@ -247,7 +272,7 @@ int call_usermodehelper(char *path, char **argv, char **envp, int wait)
        wait_for_completion(&done);
        return sub_info.retval;
 }
-EXPORT_SYMBOL(call_usermodehelper);
+EXPORT_SYMBOL(call_usermodehelper_keys);
 
 void __init usermodehelper_init(void)
 {