Skip to content

Commit

Permalink
syz-manager: make error messages about inconsistent binaries more com…
Browse files Browse the repository at this point in the history
…prehensible
  • Loading branch information
dvyukov committed Apr 19, 2018
1 parent a6714e4 commit bcc3786
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions syz-manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -939,11 +939,15 @@ func (mgr *Manager) Check(a *CheckArgs, r *int) error {
mgr.target.Arch, a.ExecutorArch)
}
if sys.GitRevision != a.FuzzerGitRev || sys.GitRevision != a.ExecutorGitRev {
Fatalf("mismatching git revisions:\nmanager= %v\nfuzzer= %v\nexecutor=%v",
Fatalf("syz-manager, syz-fuzzer and syz-executor binaries are built on different git revisions\n"+
"manager= %v\nfuzzer= %v\nexecutor=%v\n"+
"this is not supported, rebuild all binaries with make",
sys.GitRevision, a.FuzzerGitRev, a.ExecutorGitRev)
}
if mgr.target.Revision != a.FuzzerSyzRev || mgr.target.Revision != a.ExecutorSyzRev {
Fatalf("mismatching syscall descriptions:\nmanager= %v\nfuzzer= %v\nexecutor=%v",
Fatalf("syz-manager, syz-fuzzer and syz-executor binaries have different versions of system call descriptions compiled in\n"+
"manager= %v\nfuzzer= %v\nexecutor=%v\n"+
"this is not supported, rebuild all binaries with make",
mgr.target.Revision, a.FuzzerSyzRev, a.ExecutorSyzRev)
}
}
Expand Down

0 comments on commit bcc3786

Please sign in to comment.