aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/csource/generated.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2019-11-14 18:56:34 +0100
committerDmitry Vyukov <dvyukov@google.com>2019-11-16 09:58:54 +0100
commit690740b4a4e1ce9c661ca07fdd14cb2486f04e00 (patch)
tree5ce0ababf2c64b623115a0fbd33edfd11ec9b47e /pkg/csource/generated.go
parenta6e3054436b5cc7f8c4acbce9841ecb17f699fb1 (diff)
executor: refactor sandbox flags
In preparation for future changes.
Diffstat (limited to 'pkg/csource/generated.go')
-rw-r--r--pkg/csource/generated.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go
index 7d40c5615..cc75000d5 100644
--- a/pkg/csource/generated.go
+++ b/pkg/csource/generated.go
@@ -4595,9 +4595,7 @@ static void reset_ebtables()
static void checkpoint_net_namespace(void)
{
#if SYZ_EXECUTOR
- if (!flag_net_reset)
- return;
- if (flag_sandbox == sandbox_setuid)
+ if (!flag_net_reset || flag_sandbox_setuid)
return;
#endif
checkpoint_ebtables();
@@ -4609,9 +4607,7 @@ static void checkpoint_net_namespace(void)
static void reset_net_namespace(void)
{
#if SYZ_EXECUTOR
- if (!flag_net_reset)
- return;
- if (flag_sandbox == sandbox_setuid)
+ if (!flag_net_reset || flag_sandbox_setuid)
return;
#endif
reset_ebtables();
@@ -5139,8 +5135,8 @@ static void syz_setfilecon(const char* path, const char* context)
fail("setfilecon: could not set context to %s, currently %s", context, new_context);
}
-#define SYZ_HAVE_SANDBOX_ANDROID_UNTRUSTED_APP 1
-static int do_sandbox_android_untrusted_app(void)
+#define SYZ_HAVE_SANDBOX_ANDROID 1
+static int do_sandbox_android(void)
{
setup_common();
sandbox_common();