From bcc3786b307155710a0e79a932bf8e555daff60e Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 19 Apr 2018 20:12:03 +0200 Subject: syz-manager: make error messages about inconsistent binaries more comprehensible --- syz-manager/manager.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 72d007dae..47cffe115 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -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) } } -- cgit mrf-deployment