From 14f8a76fe729bddfcc96913fa4f7821f163144ac Mon Sep 17 00:00:00 2001 From: Dan Austin Date: Fri, 3 Aug 2018 13:10:54 -0700 Subject: executor: checkpoint net namespace in the right namespace With checkpoint_net_namespace moved to setup_common, and Android fuzzing session terminates prematurely due to ipv4_tables not being initialized at this time. Moving the call back to loop fixes this behavior. --- pkg/csource/generated.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/csource/generated.go') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 6960a1f94..ee719dc65 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -2946,9 +2946,6 @@ static void setup_common() setup_cgroups(); setup_binfmt_misc(); #endif -#if SYZ_EXECUTOR || SYZ_RESET_NET_NAMESPACE - checkpoint_net_namespace(); -#endif } #endif @@ -3377,7 +3374,7 @@ static void kill_and_wait(int pid, int* status) } #endif -#if SYZ_EXECUTOR || SYZ_REPEAT && SYZ_ENABLE_CGROUPS +#if SYZ_EXECUTOR || SYZ_REPEAT && (SYZ_ENABLE_CGROUPS || SYZ_RESET_NET_NAMESPACE) #include #include #include @@ -3416,6 +3413,9 @@ static void setup_loop() debug("write(%s) failed: %d\n", procs_file, errno); } #endif +#if SYZ_EXECUTOR || SYZ_RESET_NET_NAMESPACE + checkpoint_net_namespace(); +#endif } #endif -- cgit mrf-deployment