diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-05-17 19:57:54 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-05-17 19:57:54 +0200 |
| commit | 738d58ade0f41fb8ab33066dc0dd486d86383ef5 (patch) | |
| tree | 1a924306f9af60f1067aa0c9ca0859664d8f3319 /pkg/csource/linux_common.go | |
| parent | 3717901c109694be56bb24593db945e4367ecf14 (diff) | |
pkg/csource: minimize netdevices and net reset
Add separate options to minimize netdevices setup and net namespace reset.
Fixes #581
Diffstat (limited to 'pkg/csource/linux_common.go')
| -rw-r--r-- | pkg/csource/linux_common.go | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go index 77ba9b36f..4d168e661 100644 --- a/pkg/csource/linux_common.go +++ b/pkg/csource/linux_common.go @@ -60,7 +60,7 @@ var commonHeaderLinux = ` #include <sys/mman.h> #include <sys/mount.h> #endif -#if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) +#if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_ENABLE_NETDEV) #include <arpa/inet.h> #include <errno.h> #include <fcntl.h> @@ -422,7 +422,7 @@ static void use_temporary_dir() } #endif -#if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) +#if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) || defined(SYZ_ENABLE_NETDEV) static void vsnprintf_check(char* str, size_t size, const char* format, va_list args) { int rv; @@ -434,15 +434,6 @@ static void vsnprintf_check(char* str, size_t size, const char* format, va_list fail("tun: string '%s...' doesn't fit into buffer", str); } -static void snprintf_check(char* str, size_t size, const char* format, ...) -{ - va_list args; - - va_start(args, format); - vsnprintf_check(str, size, format, args); - va_end(args); -} - #define COMMAND_MAX_LEN 128 #define PATH_PREFIX "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin " #define PATH_PREFIX_LEN (sizeof(PATH_PREFIX) - 1) @@ -464,7 +455,9 @@ static void execute_command(bool panic, const char* format, ...) debug("command '%s': %d\n", &command[0], rv); } } +#endif +#if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) static int tunfd = -1; static int tun_frags_enabled; @@ -541,11 +534,23 @@ static void initialize_tun(void) REMOTE_IPV6, REMOTE_MAC, TUN_IFACE); execute_command(1, "ip link set dev %s up", TUN_IFACE); } +#endif + +#if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_NETDEV) #define DEV_IPV4 "172.20.20.%d" #define DEV_IPV6 "fe80::%02hx" #define DEV_MAC "aa:aa:aa:aa:aa:%02hx" +static void snprintf_check(char* str, size_t size, const char* format, ...) +{ + va_list args; + + va_start(args, format); + vsnprintf_check(str, size, format, args); + va_end(args); +} + static void initialize_netdevices(void) { unsigned i; @@ -559,10 +564,6 @@ static void initialize_netdevices(void) "veth0_to_team", "veth1_to_team"}; const char* devmasters[] = {"bridge", "bond", "team"}; -#ifdef SYZ_EXECUTOR - if (!flag_enable_tun) - return; -#endif for (i = 0; i < sizeof(devtypes) / (sizeof(devtypes[0])); i++) execute_command(0, "ip link add dev %s0 type %s", devtypes[i], devtypes[i]); execute_command(0, "ip link add type veth"); @@ -2243,9 +2244,10 @@ static int do_sandbox_none(void) } #if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) initialize_tun(); +#endif +#if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_NETDEV) initialize_netdevices(); #endif - loop(); doexit(1); } @@ -2271,6 +2273,8 @@ static int do_sandbox_setuid(void) fail("unshare(CLONE_NEWNET)"); #if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) initialize_tun(); +#endif +#if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_NETDEV) initialize_netdevices(); #endif @@ -2308,6 +2312,8 @@ static int namespace_sandbox_proc(void* arg) fail("unshare(CLONE_NEWNET)"); #if defined(SYZ_EXECUTOR) || defined(SYZ_TUN_ENABLE) initialize_tun(); +#endif +#if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_NETDEV) initialize_netdevices(); #endif |