From 792da3da86809da819e7b09526e1250fbfdff07d Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andreyknvl@google.com>
Date: Mon, 23 Sep 2019 19:53:19 +0200
Subject: executor, csource: adjust syz_open_dev$hiddev timeout

Looks like opening hiddev can take up to ~100 ms.
---
 executor/executor.cc   |  2 ++
 pkg/csource/csource.go | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/executor/executor.cc b/executor/executor.cc
index 4f745693e..1f51ec279 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -705,6 +705,8 @@ retry:
 			call_extra_timeout = 300;
 		if (strncmp(syscalls[call_num].name, "syz_usb_disconnect", strlen("syz_usb_disconnect")) == 0)
 			call_extra_timeout = 300;
+		if (strncmp(syscalls[call_num].name, "syz_open_dev$hiddev", strlen("syz_open_dev$hiddev")) == 0)
+			call_extra_timeout = 50;
 		uint64 copyout_index = read_input(&input_pos);
 		uint64 num_args = read_input(&input_pos);
 		if (num_args > kMaxArgs)
diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go
index 001381b58..a1f3727a7 100644
--- a/pkg/csource/csource.go
+++ b/pkg/csource/csource.go
@@ -75,11 +75,12 @@ func Write(p *prog.Prog, opts Options) ([]byte, error) {
 	}
 	// Must match timeouts in executor/executor.cc.
 	specialCallTimeouts := map[string]int{
-		"syz_usb_connect":    2000,
-		"syz_usb_control_io": 300,
-		"syz_usb_ep_write":   300,
-		"syz_usb_ep_read":    300,
-		"syz_usb_disconnect": 300,
+		"syz_usb_connect":     2000,
+		"syz_usb_control_io":  300,
+		"syz_usb_ep_write":    300,
+		"syz_usb_ep_read":     300,
+		"syz_usb_disconnect":  300,
+		"syz_open_dev$hiddev": 50,
 	}
 	timeoutExpr := "45"
 	for i, call := range p.Calls {
-- 
cgit mrf-deployment