From 5d7b90f1af2e3bf33992b75e7fcf0bab6bf49bd6 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 13 Feb 2020 18:13:37 +0100
Subject: vm/gvisor: fix potential deadlock

Fixes #1591
---
 vm/gvisor/gvisor.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vm/gvisor/gvisor.go b/vm/gvisor/gvisor.go
index eba72bda1..b65a16edc 100644
--- a/vm/gvisor/gvisor.go
+++ b/vm/gvisor/gvisor.go
@@ -338,7 +338,9 @@ func (inst *instance) Diagnose() ([]byte, bool) {
 func init() {
 	if os.Getenv("SYZ_GVISOR_PROXY") != "" {
 		fmt.Fprint(os.Stderr, initStartMsg)
-		select {}
+		// If we do select{}, we can get a deadlock panic.
+		for range time.NewTicker(time.Hour).C {
+		}
 	}
 }
 
-- 
cgit mrf-deployment