From 15846cbccf63a4e74cce5b8cf0c1931fdcf81ccd Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 15 May 2024 15:17:16 +0200 Subject: pkg/ipc: use flatrpc flags Flatrpc flags are passed in RPC execution requests, so to avoid conversions and duplicate set of flags use flatrpc flags in pkg/ipc directly. --- pkg/fuzzer/queue/queue.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkg/fuzzer/queue') diff --git a/pkg/fuzzer/queue/queue.go b/pkg/fuzzer/queue/queue.go index 6ff94b9be..36226299a 100644 --- a/pkg/fuzzer/queue/queue.go +++ b/pkg/fuzzer/queue/queue.go @@ -11,6 +11,7 @@ import ( "sync" "sync/atomic" + "github.com/google/syzkaller/pkg/flatrpc" "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/ipc" "github.com/google/syzkaller/pkg/signal" @@ -102,15 +103,15 @@ func (r *Request) Risky() bool { } func (r *Request) Validate() error { - collectSignal := r.ExecOpts.ExecFlags&ipc.FlagCollectSignal > 0 + collectSignal := r.ExecOpts.ExecFlags&flatrpc.ExecFlagCollectSignal > 0 if r.ReturnAllSignal && !collectSignal { return fmt.Errorf("ReturnAllSignal is set, but FlagCollectSignal is not") } if r.SignalFilter != nil && !collectSignal { return fmt.Errorf("SignalFilter must be used with FlagCollectSignal") } - collectComps := r.ExecOpts.ExecFlags&ipc.FlagCollectComps > 0 - collectCover := r.ExecOpts.ExecFlags&ipc.FlagCollectCover > 0 + collectComps := r.ExecOpts.ExecFlags&flatrpc.ExecFlagCollectComps > 0 + collectCover := r.ExecOpts.ExecFlags&flatrpc.ExecFlagCollectCover > 0 if (collectComps) && (collectSignal || collectCover) { return fmt.Errorf("hint collection is mutually exclusive with signal/coverage") } -- cgit mrf-deployment