Skip to content

Commit 74c097d

Browse files
committed
syz-verifier: Fix small bugs cause by rebase to master branch
This commit fixes 2 small bugs founded: - wrong use of kernel.runInstance() function - the return values of the function has been changed in the master branch so we had to update our calls to the function - Fix wrong print of call.Flags
1 parent 5376734 commit 74c097d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

syz-verifier/verifier.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -530,12 +530,12 @@ func (vrf *Verifier) fuzzingLoop(ctx context.Context) {
530530

531531
if isMismatch {
532532
log.Logf(0, "%s ┌─ %s: errno=%d, flags=0x%x",
533-
prefix, vrf.kernels[0].cfg.Name, call0.Error, call0.Flags)
533+
prefix, vrf.kernels[0].cfg.Name, call0.Error, uint8(call0.Flags))
534534
log.Logf(0, "%s └─ %s: errno=%d, flags=0x%x",
535-
prefix, vrf.kernels[i].cfg.Name, call1.Error, call1.Flags)
535+
prefix, vrf.kernels[i].cfg.Name, call1.Error, uint8(call1.Flags))
536536
} else {
537537
log.Logf(0, "%s Result: errno=%d, flags=0x%x",
538-
prefix, call0.Error, call0.Flags)
538+
prefix, call0.Error, uint8(call0.Flags))
539539
}
540540
}
541541
log.Logf(0, "")
@@ -565,14 +565,14 @@ func (kernel *Kernel) FuzzerInstance(ctx context.Context, inst *vm.Instance, upd
565565
index := inst.Index()
566566
injectExec := make(chan bool, 10)
567567
kernel.serv.CreateInstance(index, injectExec, updInfo)
568-
rep, err := kernel.runInstance(ctx, inst, injectExec)
569-
_, _ = kernel.serv.ShutdownInstance(index, rep != nil)
570-
if rep != nil {
568+
reps, err := kernel.runInstance(ctx, inst, injectExec)
569+
_, _ = kernel.serv.ShutdownInstance(index, len(reps) > 0)
570+
if len(reps) > 0 {
571571
// Just log crashes - syz-verifier focuses on behavioral differences, not crashes
572572
select {
573573
case <-ctx.Done():
574574
default:
575-
log.Logf(0, "kernel %s: VM crash detected: %s", kernel.cfg.Name, rep.Title)
575+
log.Logf(0, "kernel %s: VM crash detected: %s", kernel.cfg.Name, reps[0].Title)
576576
}
577577
}
578578
if err != nil {
@@ -581,7 +581,7 @@ func (kernel *Kernel) FuzzerInstance(ctx context.Context, inst *vm.Instance, upd
581581
}
582582

583583
func (kernel *Kernel) runInstance(ctx context.Context, inst *vm.Instance,
584-
injectExec <-chan bool) (*report.Report, error) {
584+
injectExec <-chan bool) ([]*report.Report, error) {
585585
fwdAddr, err := inst.Forward(kernel.serv.Port())
586586
if err != nil {
587587
return nil, fmt.Errorf("failed to setup port forwarding: %w", err)

0 commit comments

Comments
 (0)