add a flag to disable setpgid syscall

It is broken on some of our test systems.

2 files changed, 8 insertions, 0 deletions

diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index a94b87878..487b6e0d6 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -34,6 +34,7 @@ var (
 	flagDedup     = flag.Bool("dedup", false, "deduplicate coverage in executor")
 	flagLoop      = flag.Bool("loop", false, "execute programs in a loop")
 	flagProcs     = flag.Int("procs", 1, "number of parallel processes to execute programs")
+	flagNoPgid    = flag.Bool("nopgid", false, "don't use setpgid syscall")
 	flagTimeout   = flag.Duration("timeout", 10*time.Second, "execution timeout")
 )
 
@@ -76,6 +77,9 @@ func main() {
 	if *flagNobody {
 		flags |= ipc.FlagDropPrivs
 	}
+	if *flagNoPgid {
+		flags |= ipc.FlagNoSetpgid
+	}
 
 	var wg sync.WaitGroup
 	wg.Add(*flagProcs)
diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go
index da013507f..2a30dd6ac 100644
--- a/tools/syz-stress/stress.go
+++ b/tools/syz-stress/stress.go
@@ -30,6 +30,7 @@ var (
 	flagThreaded = flag.Bool("threaded", true, "use threaded mode in executor")
 	flagCollide  = flag.Bool("collide", true, "collide syscalls to provoke data races")
 	flagNobody   = flag.Bool("nobody", true, "impersonate into nobody")
+	flagNoPgid   = flag.Bool("nopgid", false, "don't use setpgid syscall")
 	flagTimeout  = flag.Duration("timeout", 10*time.Second, "executor timeout")
 	flagLogProg  = flag.Bool("logprog", false, "print programs before execution")
 
@@ -58,6 +59,9 @@ func main() {
 	if *flagDebug {
 		flags |= ipc.FlagDebug
 	}
+	if *flagNoPgid {
+		flags |= ipc.FlagNoSetpgid
+	}
 
 	gate = ipc.NewGate(2 * *flagProcs)
 	for pid := 0; pid < *flagProcs; pid++ {