patch-2.2.14 linux/kernel/kmod.c

• Lines: 62
• Date: Tue Jan 4 10:12:25 2000
• Orig file: v2.2.13/linux/kernel/kmod.c
• Orig date: Thu Nov 12 09:58:32 1998

diff -u --recursive --new-file v2.2.13/linux/kernel/kmod.c linux/kernel/kmod.c
@@ -23,22 +23,24 @@
 char modprobe_path[256] = "/sbin/modprobe";
 
 static inline void
-use_init_file_context(void)
+use_init_fs_context(void)
 {
 	struct fs_struct * fs;
 
-	lock_kernel();
-
 	/*
-	 * Don't use the user's root, use init's root instead.
+	 * Don't use the user's fs context, use init's instead.
 	 * Note that we can use "init_task" (which is not actually
 	 * the same as the user-level "init" process) because we
 	 * started "init" with a CLONE_FS
 	 */
-	exit_fs(current);	/* current->fs->count--; */
-	fs = init_task.fs;
-	current->fs = fs;
-	atomic_inc(&fs->count);
+
+	lock_kernel();
+
+	fs = current->fs;
+	dput(fs->root);
+	dput(fs->pwd);
+	fs->root = dget(init_task.fs->root);
+	fs->pwd = dget(init_task.fs->pwd);
 
 	unlock_kernel();
 }
@@ -49,8 +51,6 @@
 	char *argv[] = { modprobe_path, "-s", "-k", (char*)module_name, NULL };
 	int i;
 
-	use_init_file_context();
-
 	/* Prevent parent user process from sending signals to child.
 	   Otherwise, if the modprobe program does not exist, it might
 	   be possible to get a user defined signal handler to execute
@@ -62,6 +62,10 @@
 	flush_signal_handlers(current);
 	spin_unlock_irq(&current->sigmask_lock);
 
+	/* Copy root dir and cwd from init */
+	use_init_fs_context();
+
+	/* Close our copies of user's open files */
 	for (i = 0; i < current->files->max_fds; i++ ) {
 		if (current->files->fd[i]) close(i);
 	}
@@ -104,7 +108,7 @@
 		return -EPERM;
 	}
 
-	pid = kernel_thread(exec_modprobe, (void*) module_name, CLONE_FS);
+	pid = kernel_thread(exec_modprobe, (void*) module_name, 0);
 	if (pid < 0) {
 		printk(KERN_ERR "request_module[%s]: fork failed, errno %d\n", module_name, -pid);
 		return pid;