aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-06-26 16:42:22 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-06-26 16:42:22 +0200
commitb0294c53d01ff4816b69d34f27d10656d002a8fa (patch)
tree8da5574dbac00b7402f52aba508d6a676aaea54e
parentbe3706ff1e35ad71759a5803e983c4d35f7c43a8 (diff)
syz-fuzzer: partially revert "syz-fuzzer: fix gvisor testing"
This breaks patch testing on syz-ci as it can use older version of syz-fuzzer.
-rw-r--r--pkg/instance/instance.go16
-rw-r--r--syz-fuzzer/testing.go3
2 files changed, 2 insertions, 17 deletions
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index f804b2724..4e28e0b92 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -8,7 +8,6 @@ package instance
import (
"bytes"
"fmt"
- "io/ioutil"
"net"
"os"
"path/filepath"
@@ -216,20 +215,9 @@ func (inst *inst) testInstance() error {
go func() {
conn, err := ln.Accept()
if err != nil {
- acceptErr <- err
- return
+ conn.Close()
}
- defer conn.Close()
- data, err := ioutil.ReadAll(conn)
- if err != nil {
- acceptErr <- err
- return
- }
- if string(data) != "HELLO" {
- acceptErr <- fmt.Errorf("received bad handshake from VM: %q", string(data))
- return
- }
- acceptErr <- nil
+ acceptErr <- err
}()
fwdAddr, err := inst.vm.Forward(ln.Addr().(*net.TCPAddr).Port)
if err != nil {
diff --git a/syz-fuzzer/testing.go b/syz-fuzzer/testing.go
index 7b544ee35..990891348 100644
--- a/syz-fuzzer/testing.go
+++ b/syz-fuzzer/testing.go
@@ -33,9 +33,6 @@ func testImage(hostAddr string, args *checkArgs) {
if err != nil {
log.Fatalf("failed to connect: %v", err)
}
- if _, err := conn.Write([]byte("HELLO")); err != nil {
- log.Fatalf("failed to write to host: %v", err)
- }
conn.Close()
if _, err := checkMachine(args); err != nil {
log.Fatalf("%v", err)