diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-execprog/execprog.go | 34 | ||||
| -rw-r--r-- | tools/syz-stress/stress.go | 28 |
2 files changed, 2 insertions, 60 deletions
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go index 5d68dd2dd..9cfebf15b 100644 --- a/tools/syz-execprog/execprog.go +++ b/tools/syz-execprog/execprog.go @@ -375,38 +375,6 @@ func createConfig(target *prog.Target, features *host.Features, featuresFlags cs } execOpts.ExecFlags |= ipc.FlagCollectComps } - if features[host.FeatureExtraCoverage].Enabled { - execOpts.EnvFlags |= ipc.FlagExtraCover - } - if features[host.FeatureDelayKcovMmap].Enabled { - execOpts.EnvFlags |= ipc.FlagDelayKcovMmap - } - if featuresFlags["tun"].Enabled && features[host.FeatureNetInjection].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableTun - } - if featuresFlags["net_dev"].Enabled && features[host.FeatureNetDevices].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNetDev - } - if featuresFlags["net_reset"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNetReset - } - if featuresFlags["cgroups"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableCgroups - } - if featuresFlags["close_fds"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableCloseFds - } - if featuresFlags["devlink_pci"].Enabled && features[host.FeatureDevlinkPCI].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableDevlinkPCI - } - if featuresFlags["nic_vf"].Enabled && features[host.FeatureNicVF].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNicVF - } - if featuresFlags["vhci"].Enabled && features[host.FeatureVhciInjection].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableVhciInjection - } - if featuresFlags["wifi"].Enabled && features[host.FeatureWifiEmulation].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableWifi - } + execOpts.EnvFlags |= ipc.FeaturesToFlags(features, featuresFlags) return config, execOpts } diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go index 8396148e2..080c8615e 100644 --- a/tools/syz-stress/stress.go +++ b/tools/syz-stress/stress.go @@ -150,33 +150,7 @@ func createIPCConfig(target *prog.Target, features *host.Features, featuresFlags if err != nil { return nil, nil, err } - if featuresFlags["tun"].Enabled && features[host.FeatureNetInjection].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableTun - } - if featuresFlags["net_dev"].Enabled && features[host.FeatureNetDevices].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNetDev - } - if featuresFlags["net_reset"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNetReset - } - if featuresFlags["cgroups"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableCgroups - } - if featuresFlags["close_fds"].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableCloseFds - } - if featuresFlags["devlink_pci"].Enabled && features[host.FeatureDevlinkPCI].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableDevlinkPCI - } - if featuresFlags["nic_vf"].Enabled && features[host.FeatureNicVF].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableNicVF - } - if featuresFlags["vhci"].Enabled && features[host.FeatureVhciInjection].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableVhciInjection - } - if featuresFlags["wifi"].Enabled && features[host.FeatureWifiEmulation].Enabled { - execOpts.EnvFlags |= ipc.FlagEnableWifi - } + execOpts.EnvFlags |= ipc.FeaturesToFlags(features, featuresFlags) return config, execOpts, nil } |