aboutsummaryrefslogtreecommitdiffstats
path: root/executor/executor.cc
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@google.com>2017-01-31 18:40:10 +0100
committerAndrey Konovalov <andreyknvl@google.com>2017-01-31 18:40:10 +0100
commitf3bb6d96be685a64af8050d57f5ced7ec75da2e0 (patch)
tree39482b00bb34df5bd7e4730ac6c423ec2603f5bf /executor/executor.cc
parentdd4e19c77a5326ec907cdf89df0cf9fc41aa17d9 (diff)
executor: fix tun initialization when sandbox != none
Diffstat (limited to 'executor/executor.cc')
-rw-r--r--executor/executor.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/executor/executor.cc b/executor/executor.cc
index f228e1d74..7b7079706 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -164,18 +164,18 @@ int main(int argc, char** argv)
uint64_t executor_pid = *((uint64_t*)input_data + 1);
cover_open();
- setup_main_process(executor_pid, flag_enable_tun);
+ setup_main_process();
int pid = -1;
switch (flag_sandbox) {
case sandbox_none:
- pid = do_sandbox_none();
+ pid = do_sandbox_none(executor_pid, flag_enable_tun);
break;
case sandbox_setuid:
- pid = do_sandbox_setuid();
+ pid = do_sandbox_setuid(executor_pid, flag_enable_tun);
break;
case sandbox_namespace:
- pid = do_sandbox_namespace();
+ pid = do_sandbox_namespace(executor_pid, flag_enable_tun);
break;
default:
fail("unknown sandbox type");