commit c3632b1aab9fa47a0193b200b61bbc9ff1374fb6
author Hans Boehm <hboehm@google.com> Mon May 17 15:18:14 2021 -0700
committer Hans Boehm <hboehm@google.com> Tue May 18 15:47:31 2021 +0000
tree de8984b47580239c095a8104a1791a0345d935b4
parent 7414ec29f15bf9c5c8ad5af5ce45b3f5fc41ce80

Avoid timeout with >= 1 billion nsecs

Registering a timeout of >= 1000 msecs produced an error message,
but still resulted in a system call with timeout nsecs >= 1 billion,
which would cause an error return from the system call and a crash.

Avoid this by restricting timeouts to the maximum. Also enforce
minimum for symmetry.

Bug: 140968481
Test: TreeHugger
Change-Id: I191fb88a03bf09d2c5a93864bb26624c10b6e52d

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 5343150..38f8ce1 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1418,9 +1418,13 @@
 
   monitor_timeout_enable_ = runtime_options.GetOrDefault(Opt::MonitorTimeoutEnable);
   int monitor_timeout_ms = runtime_options.GetOrDefault(Opt::MonitorTimeout);
-  if (monitor_timeout_ms < Monitor::kMonitorTimeoutMinMs ||
-      monitor_timeout_ms >= Monitor::kMonitorTimeoutMaxMs) {
-    LOG(ERROR) << "Improper monitor timeout could cause crash!";
+  if (monitor_timeout_ms < Monitor::kMonitorTimeoutMinMs) {
+    LOG(WARNING) << "Monitor timeout too short: Increasing";
+    monitor_timeout_ms = Monitor::kMonitorTimeoutMinMs;
+  }
+  if (monitor_timeout_ms >= Monitor::kMonitorTimeoutMaxMs) {
+    LOG(WARNING) << "Monitor timeout too long: Decreasing";
+    monitor_timeout_ms = Monitor::kMonitorTimeoutMaxMs - 1;
   }
   monitor_timeout_ns_ = MsToNs(monitor_timeout_ms);