upstream commit

Add monotime_ts and monotime_tv that return monotonic
timespec and timeval respectively.  Replace calls to gettimeofday() in packet
timing with monotime_tv so that the callers will work over a clock step.
Should prevent integer overflow during clock steps reported by wangle6 at
huawei.com. "I like" markus@

OpenBSD-Commit-ID: 74d684264814ff806f197948b87aa732cb1b0b8a

1 files changed, 4 insertions, 4 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 258123ae8..a816a220e 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.115 2017/06/30 04:17:23 dtucker Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.116 2017/11/25 06:46:22 dtucker Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -377,7 +377,7 @@ conalloc(char *iname, char *oname, int keytype)
         fdcon[s].c_len = 4;
         fdcon[s].c_off = 0;
         fdcon[s].c_keytype = keytype;
-        gettimeofday(&fdcon[s].c_tv, NULL);
+        monotime_tv(&fdcon[s].c_tv);
         fdcon[s].c_tv.tv_sec += timeout;
         TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);
         FD_SET(s, read_wait);
@@ -411,7 +411,7 @@ static void
 contouch(int s)
 {
         TAILQ_REMOVE(&tq, &fdcon[s], c_link);
-        gettimeofday(&fdcon[s].c_tv, NULL);
+        monotime_tv(&fdcon[s].c_tv);
         fdcon[s].c_tv.tv_sec += timeout;
         TAILQ_INSERT_TAIL(&tq, &fdcon[s], c_link);
 }
@@ -545,7 +545,7 @@ conloop(void)
         con *c;
         int i;
 
-        gettimeofday(&now, NULL);
+        monotime_tv(&now);
         c = TAILQ_FIRST(&tq);
 
         if (c && (c->c_tv.tv_sec > now.tv_sec ||