diff options
Diffstat (limited to 'syz-verifier')
| -rw-r--r-- | syz-verifier/execresult.go (renamed from syz-verifier/verifier.go) | 8 | ||||
| -rw-r--r-- | syz-verifier/execresult_test.go (renamed from syz-verifier/verifier_test.go) | 28 | ||||
| -rwxr-xr-x | syz-verifier/main.go | 4 | ||||
| -rw-r--r-- | syz-verifier/main_test.go | 62 | ||||
| -rw-r--r-- | syz-verifier/rpcserver.go | 14 | ||||
| -rw-r--r-- | syz-verifier/test_utils.go | 8 |
6 files changed, 61 insertions, 63 deletions
diff --git a/syz-verifier/verifier.go b/syz-verifier/execresult.go index 9e97046b9..d3db18882 100644 --- a/syz-verifier/verifier.go +++ b/syz-verifier/execresult.go @@ -11,8 +11,8 @@ import ( "github.com/google/syzkaller/prog" ) -// Result stores the results of executing a program. -type Result struct { +// ExecResult stores the results of executing a program. +type ExecResult struct { // Pool is the index of the pool. Pool int // Hanged is set to true when a program was killed due to hanging. @@ -71,7 +71,7 @@ func (s ReturnState) String() string { // VeifyRerun compares the results obtained from rerunning a program with what // was reported in the initial result report. -func VerifyRerun(res []*Result, rr *ResultReport) bool { +func VerifyRerun(res []*ExecResult, rr *ResultReport) bool { for idx, cr := range rr.Reports { for _, r := range res { var state ReturnState @@ -92,7 +92,7 @@ func VerifyRerun(res []*Result, rr *ResultReport) bool { // Verify checks whether the Results of the same program, executed on different // kernels, are the same. If that's not the case, it returns a ResultReport, // highlighting the differences. -func Verify(res []*Result, prog *prog.Prog, s *Stats) *ResultReport { +func Verify(res []*ExecResult, prog *prog.Prog, s *Stats) *ResultReport { rr := &ResultReport{ Prog: string(prog.Serialize()), } diff --git a/syz-verifier/verifier_test.go b/syz-verifier/execresult_test.go index 41344bafc..aae7bcdac 100644 --- a/syz-verifier/verifier_test.go +++ b/syz-verifier/execresult_test.go @@ -16,24 +16,24 @@ func TestVerify(t *testing.T) { "test$res0()\n" tests := []struct { name string - res []*Result + res []*ExecResult wantReport *ResultReport wantStats []*CallStats }{ { name: "only crashes", - res: []*Result{ - makeResultCrashed(1), - makeResultCrashed(4), + res: []*ExecResult{ + makeExecResultCrashed(1), + makeExecResultCrashed(4), }, wantReport: nil, }, { name: "mismatches because results and crashes", - res: []*Result{ - makeResultCrashed(1), - makeResult(2, []int{11, 33, 22}, []int{1, 3, 3}...), - makeResult(4, []int{11, 33, 22}, []int{1, 3, 3}...), + res: []*ExecResult{ + makeExecResultCrashed(1), + makeExecResult(2, []int{11, 33, 22}, []int{1, 3, 3}...), + makeExecResult(4, []int{11, 33, 22}, []int{1, 3, 3}...), }, wantReport: &ResultReport{ Prog: p, @@ -58,16 +58,16 @@ func TestVerify(t *testing.T) { }, { name: "mismatches not found in results", - res: []*Result{ - makeResult(2, []int{11, 33, 22}, []int{1, 3, 3}...), - makeResult(4, []int{11, 33, 22}, []int{1, 3, 3}...)}, + res: []*ExecResult{ + makeExecResult(2, []int{11, 33, 22}, []int{1, 3, 3}...), + makeExecResult(4, []int{11, 33, 22}, []int{1, 3, 3}...)}, wantReport: nil, }, { name: "mismatches found in results", - res: []*Result{ - makeResult(1, []int{1, 3, 2}, []int{4, 7, 7}...), - makeResult(4, []int{1, 3, 5}, []int{4, 7, 3}...), + res: []*ExecResult{ + makeExecResult(1, []int{1, 3, 2}, []int{4, 7, 7}...), + makeExecResult(4, []int{1, 3, 5}, []int{4, 7, 3}...), }, wantReport: &ResultReport{ Prog: p, diff --git a/syz-verifier/main.go b/syz-verifier/main.go index 737d336b6..168e69d26 100755 --- a/syz-verifier/main.go +++ b/syz-verifier/main.go @@ -62,8 +62,6 @@ type Verifier struct { reruns int } - - // poolInfo contains kernel-specific information for spawning virtual machines // and reporting crashes. It also keeps track of the Runners executing on // spawned VMs, what programs have been sent to each Runner and what programs @@ -89,7 +87,7 @@ type progInfo struct { prog *prog.Prog idx int serialized []byte - res [][]*Result + res [][]*ExecResult // received stores the number of results received for this program. received int diff --git a/syz-verifier/main_test.go b/syz-verifier/main_test.go index 6bf7c3d7d..b083b1a9b 100644 --- a/syz-verifier/main_test.go +++ b/syz-verifier/main_test.go @@ -91,23 +91,23 @@ func TestNewResult(t *testing.T) { srv.pools = map[int]*poolInfo{0: {}, 1: {}} srv.progs = map[int]*progInfo{ 1: {idx: 1, - res: func() [][]*Result { - res := make([][]*Result, 1) - res[0] = make([]*Result, 2) + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) + res[0] = make([]*ExecResult, 2) return res }(), }, 3: {idx: 3, - res: func() [][]*Result { - res := make([][]*Result, 1) - res[0] = make([]*Result, 2) - res[0][1] = &Result{Pool: 1} + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) + res[0] = make([]*ExecResult, 2) + res[0][1] = &ExecResult{Pool: 1} return res }(), received: 1, }, } - gotReady := srv.newResult(&Result{Pool: 0}, srv.progs[test.idx]) + gotReady := srv.newResult(&ExecResult{Pool: 0}, srv.progs[test.idx]) if test.wantReady != gotReady { t.Errorf("srv.newResult: got %v want %v", gotReady, test.wantReady) } @@ -323,16 +323,16 @@ func TestUpdateUnsupportedNotCalledTwice(t *testing.T) { func TestProcessResults(t *testing.T) { tests := []struct { name string - res []*Result + res []*ExecResult prog string wantExist bool wantStats *Stats }{ { name: "report written", - res: []*Result{ - makeResult(0, []int{1, 3, 2}), - makeResult(1, []int{1, 3, 5}), + res: []*ExecResult{ + makeExecResult(0, []int{1, 3, 2}), + makeExecResult(1, []int{1, 3, 5}), }, wantExist: true, wantStats: &Stats{ @@ -347,9 +347,9 @@ func TestProcessResults(t *testing.T) { }, { name: "no report written", - res: []*Result{ - makeResult(0, []int{11, 33, 22}), - makeResult(1, []int{11, 33, 22}), + res: []*ExecResult{ + makeExecResult(0, []int{11, 33, 22}), + makeExecResult(1, []int{11, 33, 22}), }, wantStats: &Stats{ TotalProgs: 1, @@ -366,8 +366,8 @@ func TestProcessResults(t *testing.T) { prog := getTestProgram(t) pi := &progInfo{ prog: prog, - res: func() [][]*Result { - res := make([][]*Result, 1) + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) res[0] = test.res return res }()} @@ -447,16 +447,16 @@ func TestCleanup(t *testing.T) { 4: { idx: 4, received: 0, - res: func() [][]*Result { - res := make([][]*Result, 1) - res[0] = make([]*Result, 3) + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) + res[0] = make([]*ExecResult, 3) return res }(), }}, wantProg: &progInfo{ idx: 4, received: 1, - res: [][]*Result{{makeResultCrashed(0), nil, nil}}, + res: [][]*ExecResult{{makeExecResultCrashed(0), nil, nil}}, }, wantStats: emptyTestStats(), fileExists: false, @@ -468,11 +468,11 @@ func TestCleanup(t *testing.T) { idx: 4, prog: prog, received: 2, - res: func() [][]*Result { - res := make([][]*Result, 1) - res[0] = make([]*Result, 3) - res[0][1] = makeResultCrashed(1) - res[0][2] = makeResultCrashed(2) + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) + res[0] = make([]*ExecResult, 3) + res[0][1] = makeExecResultCrashed(1) + res[0][2] = makeExecResultCrashed(2) return res }(), }}, @@ -493,11 +493,11 @@ func TestCleanup(t *testing.T) { idx: 4, prog: prog, received: 2, - res: func() [][]*Result { - res := make([][]*Result, 1) - res[0] = make([]*Result, 3) - res[0][1] = makeResult(1, []int{11, 33, 44}) - res[0][2] = makeResult(2, []int{11, 33, 22}) + res: func() [][]*ExecResult { + res := make([][]*ExecResult, 1) + res[0] = make([]*ExecResult, 3) + res[0][1] = makeExecResult(1, []int{11, 33, 44}) + res[0][2] = makeExecResult(2, []int{11, 33, 22}) return res }(), }}, diff --git a/syz-verifier/rpcserver.go b/syz-verifier/rpcserver.go index f4956da88..aef89a135 100644 --- a/syz-verifier/rpcserver.go +++ b/syz-verifier/rpcserver.go @@ -97,10 +97,10 @@ func (srv *RPCServer) NextExchange(a *rpctype.NextExchangeArgs, r *rpctype.NextE srv.mu.Lock() defer srv.mu.Unlock() - var res *Result + var res *ExecResult var prog *progInfo if a.Info.Calls != nil { - res = &Result{ + res = &ExecResult{ Pool: a.Pool, Hanged: a.Hanged, Info: a.Info, @@ -144,7 +144,7 @@ func (srv *RPCServer) NextExchange(a *rpctype.NextExchangeArgs, r *rpctype.NextE // newResult is called when a Runner sends a new Result. It returns true if all // Results from the corresponding programs have been received and they can be // sent for verification. Otherwise, it returns false. -func (srv *RPCServer) newResult(res *Result, prog *progInfo) bool { +func (srv *RPCServer) newResult(res *ExecResult, prog *progInfo) bool { ri := prog.runIdx if prog.res[ri][res.Pool] != nil { return false @@ -157,7 +157,7 @@ func (srv *RPCServer) newResult(res *Result, prog *progInfo) bool { func (srv *RPCServer) newRun(p *progInfo) { p.runIdx++ p.received = 0 - p.res[p.runIdx] = make([]*Result, len(srv.pools)) + p.res[p.runIdx] = make([]*ExecResult, len(srv.pools)) for _, pool := range srv.pools { pool.toRerun = append(pool.toRerun, p) } @@ -181,9 +181,9 @@ func (srv *RPCServer) newProgram(poolIdx, vmIdx int) ([]byte, int, int) { prog: prog, idx: progIdx, serialized: prog.Serialize(), - res: make([][]*Result, srv.vrf.reruns), + res: make([][]*ExecResult, srv.vrf.reruns), } - pi.res[0] = make([]*Result, len(srv.pools)) + pi.res[0] = make([]*ExecResult, len(srv.pools)) for _, pool := range srv.pools { pool.progs = append(pool.progs, pi) } @@ -202,7 +202,7 @@ func (srv *RPCServer) cleanup(poolIdx, vmIdx int) { progs := srv.pools[poolIdx].runners[vmIdx] for _, prog := range progs { - if srv.newResult(&Result{Pool: poolIdx, Crashed: true}, prog) { + if srv.newResult(&ExecResult{Pool: poolIdx, Crashed: true}, prog) { srv.vrf.processResults(prog) delete(srv.progs, prog.idx) delete(srv.pools[poolIdx].runners[vmIdx], prog.idx) diff --git a/syz-verifier/test_utils.go b/syz-verifier/test_utils.go index a32c0aa29..5dd41aee2 100644 --- a/syz-verifier/test_utils.go +++ b/syz-verifier/test_utils.go @@ -60,8 +60,8 @@ func makeTestResultDirectory(t *testing.T) string { return resultsdir } -func makeResult(pool int, errnos []int, flags ...int) *Result { - r := &Result{Pool: pool, Info: ipc.ProgInfo{Calls: []ipc.CallInfo{}}} +func makeExecResult(pool int, errnos []int, flags ...int) *ExecResult { + r := &ExecResult{Pool: pool, Info: ipc.ProgInfo{Calls: []ipc.CallInfo{}}} for _, e := range errnos { r.Info.Calls = append(r.Info.Calls, ipc.CallInfo{Errno: e}) } @@ -72,8 +72,8 @@ func makeResult(pool int, errnos []int, flags ...int) *Result { return r } -func makeResultCrashed(pool int) *Result { - return &Result{Pool: pool, Crashed: true} +func makeExecResultCrashed(pool int) *ExecResult { + return &ExecResult{Pool: pool, Crashed: true} } func emptyTestStats() *Stats { |