255 lines
7.2 KiB
Diff
255 lines
7.2 KiB
Diff
--- a/arch/um/drivers/mconsole_kern.c 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/drivers/mconsole_kern.c 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -4,6 +4,7 @@
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
+#include "linux/kmod.h"
|
|
#include <linux/console.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/interrupt.h>
|
|
@@ -18,6 +19,7 @@
|
|
#include <linux/utsname.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/mutex.h>
|
|
+#include <linux/file.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
#include "init.h"
|
|
@@ -199,6 +201,44 @@
|
|
}
|
|
#endif
|
|
|
|
+void mconsole_exec(struct mc_request *req)
|
|
+{
|
|
+ int res, len;
|
|
+ struct file *out;
|
|
+ char buf[MCONSOLE_MAX_DATA];
|
|
+
|
|
+ char *envp[] = {
|
|
+ "HOME=/", "TERM=linux",
|
|
+ "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin",
|
|
+ NULL
|
|
+ };
|
|
+ char *argv[] = {
|
|
+ "/bin/sh", "-c",
|
|
+ req->request.data + strlen("exec "),
|
|
+ NULL
|
|
+ };
|
|
+ res = call_usermodehelper_pipe("/bin/sh", argv, envp, NULL, &out);
|
|
+
|
|
+ if (res < 0) {
|
|
+ mconsole_reply(req, "call_usermodehelper_pipe failed", 1, 0);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for (;;) {
|
|
+ len = out->f_op->read(out, buf, sizeof(buf), 0);
|
|
+ if (len < 0) {
|
|
+ mconsole_reply(req, "reading output failed", 1, 0);
|
|
+ break;
|
|
+ }
|
|
+ if (len == 0) {
|
|
+ mconsole_reply_len(req, buf, len, 0, 0);
|
|
+ break;
|
|
+ }
|
|
+ mconsole_reply_len(req, buf, len, 0, 1);
|
|
+ }
|
|
+ fput(out);
|
|
+}
|
|
+
|
|
void mconsole_proc(struct mc_request *req)
|
|
{
|
|
char path[64];
|
|
@@ -270,6 +310,7 @@
|
|
stop - pause the UML; it will do nothing until it receives a 'go' \n\
|
|
go - continue the UML after a 'stop' \n\
|
|
log <string> - make UML enter <string> into the kernel log\n\
|
|
+ exec <string> - pass <string> to /bin/sh -c synchronously\n\
|
|
proc <file> - returns the contents of the UML's /proc/<file>\n\
|
|
stack <pid> - returns the stack of the specified pid\n\
|
|
"
|
|
--- a/arch/um/drivers/mconsole_user.c 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/drivers/mconsole_user.c 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -32,6 +32,7 @@
|
|
{ "stop", mconsole_stop, MCONSOLE_PROC },
|
|
{ "go", mconsole_go, MCONSOLE_INTR },
|
|
{ "log", mconsole_log, MCONSOLE_INTR },
|
|
+ { "exec", mconsole_exec, MCONSOLE_PROC },
|
|
{ "proc", mconsole_proc, MCONSOLE_PROC },
|
|
{ "stack", mconsole_stack, MCONSOLE_INTR },
|
|
};
|
|
--- a/arch/um/include/mconsole.h 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/include/mconsole.h 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -85,6 +85,7 @@
|
|
extern void mconsole_stop(struct mc_request *req);
|
|
extern void mconsole_go(struct mc_request *req);
|
|
extern void mconsole_log(struct mc_request *req);
|
|
+extern void mconsole_exec(struct mc_request *req);
|
|
extern void mconsole_proc(struct mc_request *req);
|
|
extern void mconsole_stack(struct mc_request *req);
|
|
|
|
--- a/kernel/kmod.c 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/kernel/kmod.c 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -125,6 +125,7 @@
|
|
enum umh_wait wait;
|
|
int retval;
|
|
struct file *stdin;
|
|
+ struct file *stdout;
|
|
void (*cleanup)(char **argv, char **envp);
|
|
};
|
|
|
|
@@ -160,8 +161,26 @@
|
|
FD_SET(0, fdt->open_fds);
|
|
FD_CLR(0, fdt->close_on_exec);
|
|
spin_unlock(&f->file_lock);
|
|
-
|
|
- /* and disallow core files too */
|
|
+ }
|
|
+ if (sub_info->stdout) {
|
|
+ struct files_struct *f = current->files;
|
|
+ struct fdtable *fdt;
|
|
+
|
|
+ sys_close(1);
|
|
+ sys_close(2);
|
|
+ get_file(sub_info->stdout);
|
|
+ fd_install(1, sub_info->stdout);
|
|
+ fd_install(2, sub_info->stdout);
|
|
+ spin_lock(&f->file_lock);
|
|
+ fdt = files_fdtable(f);
|
|
+ FD_SET(1, fdt->open_fds);
|
|
+ FD_CLR(1, fdt->close_on_exec);
|
|
+ FD_SET(2, fdt->open_fds);
|
|
+ FD_CLR(2, fdt->close_on_exec);
|
|
+ spin_unlock(&f->file_lock);
|
|
+ }
|
|
+ if (sub_info->stdin || sub_info->stdout) {
|
|
+ /* disallow core files */
|
|
current->signal->rlim[RLIMIT_CORE] = (struct rlimit){0, 0};
|
|
}
|
|
|
|
@@ -433,6 +452,29 @@
|
|
}
|
|
EXPORT_SYMBOL(call_usermodehelper_stdinpipe);
|
|
|
|
+int call_usermodehelper_stdoutpipe(struct subprocess_info *sub_info,
|
|
+ struct file **filp)
|
|
+{
|
|
+ struct file *f;
|
|
+
|
|
+ f = create_write_pipe();
|
|
+ if (IS_ERR(f))
|
|
+ return PTR_ERR(f);
|
|
+ sub_info->stdout = f;
|
|
+
|
|
+ f = create_read_pipe(f);
|
|
+ if (IS_ERR(f)) {
|
|
+ free_write_pipe(sub_info->stdout);
|
|
+ sub_info->stdout = NULL;
|
|
+ return PTR_ERR(f);
|
|
+ }
|
|
+ *filp = f;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EXPORT_SYMBOL(call_usermodehelper_stdoutpipe);
|
|
+
|
|
+
|
|
/**
|
|
* call_usermodehelper_exec - start a usermode application
|
|
* @sub_info: information about the subprocessa
|
|
@@ -489,7 +531,7 @@
|
|
* lower-level call_usermodehelper_* functions.
|
|
*/
|
|
int call_usermodehelper_pipe(char *path, char **argv, char **envp,
|
|
- struct file **filp)
|
|
+ struct file **in, struct file **out)
|
|
{
|
|
struct subprocess_info *sub_info;
|
|
int ret;
|
|
@@ -498,9 +540,17 @@
|
|
if (sub_info == NULL)
|
|
return -ENOMEM;
|
|
|
|
- ret = call_usermodehelper_stdinpipe(sub_info, filp);
|
|
- if (ret < 0)
|
|
- goto out;
|
|
+ if (in) {
|
|
+ ret = call_usermodehelper_stdinpipe(sub_info, in);
|
|
+ if (ret < 0)
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ if (out) {
|
|
+ ret = call_usermodehelper_stdoutpipe(sub_info, out);
|
|
+ if (ret < 0)
|
|
+ goto out;
|
|
+ }
|
|
|
|
return call_usermodehelper_exec(sub_info, UMH_WAIT_EXEC);
|
|
|
|
--- a/include/linux/kmod.h 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/include/linux/kmod.h 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -93,6 +93,6 @@
|
|
|
|
struct file;
|
|
extern int call_usermodehelper_pipe(char *path, char *argv[], char *envp[],
|
|
- struct file **filp);
|
|
+ struct file **in, struct file **out);
|
|
|
|
#endif /* __LINUX_KMOD_H__ */
|
|
--- a/fs/exec.c 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/fs/exec.c 2008-07-15 15:41:54.000000000 +0200
|
|
@@ -1741,7 +1741,7 @@
|
|
|
|
/* SIGPIPE can happen, but it's just never processed */
|
|
if (call_usermodehelper_pipe(corename+1, helper_argv, NULL,
|
|
- &file)) {
|
|
+ &file, NULL)) {
|
|
printk(KERN_INFO "Core dump to %s pipe failed\n",
|
|
corename);
|
|
goto fail_unlock;
|
|
--- a/arch/um/Makefile 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/Makefile 2008-07-15 16:27:02.000000000 +0200
|
|
@@ -77,6 +77,7 @@
|
|
KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
|
|
-Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
|
|
KBUILD_CFLAGS += $(KERNEL_DEFINES)
|
|
+KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
|
|
|
|
PHONY += linux
|
|
|
|
--- a/arch/um/Makefile-i386 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/Makefile-i386 2008-07-15 16:23:57.000000000 +0200
|
|
@@ -32,11 +32,4 @@
|
|
# an unresolved reference.
|
|
cflags-y += -ffreestanding
|
|
|
|
-# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
|
|
-# a lot more stack due to the lack of sharing of stacklots. Also, gcc
|
|
-# 4.3.0 needs -funit-at-a-time for extern inline functions.
|
|
-KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
|
|
- echo $(call cc-option,-fno-unit-at-a-time); \
|
|
- else echo $(call cc-option,-funit-at-a-time); fi ;)
|
|
-
|
|
KBUILD_CFLAGS += $(cflags-y)
|
|
--- a/arch/um/Makefile-x86_64 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/Makefile-x86_64 2008-07-15 16:24:20.000000000 +0200
|
|
@@ -21,6 +21,3 @@
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
|
|
LINK-y += -m64
|
|
-
|
|
-# Do unit-at-a-time unconditionally on x86_64, following the host
|
|
-KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
|
|
--- a/arch/um/drivers/line.c 2008-07-13 23:51:29.000000000 +0200
|
|
+++ b/arch/um/drivers/line.c 2008-07-28 15:13:19.000000000 +0200
|
|
@@ -876,6 +876,6 @@
|
|
return base;
|
|
}
|
|
|
|
- snprintf(title, len, "%s (%s)", base, umid);
|
|
+ snprintf(title, len, "%s (%s)", umid, base);
|
|
return title;
|
|
}
|