1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
--- linux-2.6.26rc5-orig/arch/um/drivers/mconsole_kern.c 2008-04-17 04:49:44.000000000 +0200
+++ uml-2.6.26rc5/arch/um/drivers/mconsole_kern.c 2008-07-08 16:00:07.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,36 @@
}
#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:/usr/sbin:/bin:/usr/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 +302,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\
"
--- linux-2.6.26rc5-orig/arch/um/drivers/mconsole_user.c 2008-05-21 18:34:47.000000000 +0200
+++ uml-2.6.26rc5/arch/um/drivers/mconsole_user.c 2008-07-07 13:47:13.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 },
};
--- linux-2.6.26rc5-orig/arch/um/include/mconsole.h 2008-04-17 04:49:44.000000000 +0200
+++ uml-2.6.26rc5/arch/um/include/mconsole.h 2008-07-07 13:46:56.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);
--- linux-2.6.26rc5-orig/kernel/kmod.c 2008-05-21 18:34:56.000000000 +0200
+++ uml-2.6.26rc5/kernel/kmod.c 2008-07-08 13:50:37.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);
--- linux-2.6.26rc5-orig/include/linux/kmod.h 2008-04-17 04:49:44.000000000 +0200
+++ uml-2.6.26rc5/include/linux/kmod.h 2008-07-08 10:29:29.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__ */
--- linux-2.6.26rc5-orig/fs/exec.c 2008-06-05 14:00:42.000000000 +0200
+++ uml-2.6.26rc5/fs/exec.c 2008-07-08 10:28:33.000000000 +0200
@@ -1737,7 +1737,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;
|
