reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2025-02-12 06:50:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

runtest: fix using configs with namespace/setuid sandbox

Browse Source
This commit is contained in:
Andrey Konovalov 2020-04-01 19:06:15 +02:00 committed by Andrey Konovalov
parent 09ff5abc02
commit 81c5026f57
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syz-fuzzer/testing.go
View File

@ -152,12 +152,16 @@ func checkMachine(args *checkArgs) (*rpctype.CheckArgs, error) {
} }
sandboxes := []string{args.sandbox} sandboxes := []string{args.sandbox}
if args.allSandboxes { if args.allSandboxes {
if features[host.FeatureSandboxSetuid].Enabled { if args.sandbox != "none" {
sandboxes = append(sandboxes, "none")
}
if args.sandbox != "setuid" && features[host.FeatureSandboxSetuid].Enabled {
sandboxes = append(sandboxes, "setuid") sandboxes = append(sandboxes, "setuid")
} }
if features[host.FeatureSandboxNamespace].Enabled { if args.sandbox != "namespace" && features[host.FeatureSandboxNamespace].Enabled {
sandboxes = append(sandboxes, "namespace") sandboxes = append(sandboxes, "namespace")
} }
// TODO: Add "android" sandbox here when needed. Will require fixing runtests.
} }
for _, sandbox := range sandboxes { for _, sandbox := range sandboxes {
enabledCalls, disabledCalls, err := buildCallList(args.target, args.enabledCalls, sandbox) enabledCalls, disabledCalls, err := buildCallList(args.target, args.enabledCalls, sandbox)

3
tools/syz-runtest/runtest.go
View File

@ -115,6 +115,9 @@ func main() {
fmt.Printf("%-24v: %v\n", feat.Name, feat.Reason) fmt.Printf("%-24v: %v\n", feat.Name, feat.Reason)
} }
for sandbox, calls := range enabledCalls { for sandbox, calls := range enabledCalls {
if sandbox == "" {
sandbox = "no"
}
fmt.Printf("%-24v: %v calls enabled\n", sandbox+" sandbox", len(calls)) fmt.Printf("%-24v: %v calls enabled\n", sandbox+" sandbox", len(calls))
} }
ctx := &runtest.Context{ ctx := &runtest.Context{