diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-01-15 03:32:41 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-18 08:43:43 +0100 |
| commit | 5339ab369c225b40bc64d5ec3374f5c91b3ad609 (patch) | |
| tree | 632766641b2a17e212f17f157fe5a89f28acc29e /misc.c | |
| parent | upstream: Minor grammatical correction. (diff) | |
| download | openssh-5339ab369c225b40bc64d5ec3374f5c91b3ad609.tar.xz openssh-5339ab369c225b40bc64d5ec3374f5c91b3ad609.zip | |
upstream: In waitfd(), when poll returns early we are subtracting
the elapsed time from the timeout each loop, so we only want to measure the
elapsed time the poll() in that loop, not since the start of the function.
Spotted by chris.xj.zhu at gmail.com, ok djm@
OpenBSD-Commit-ID: 199df060978ee9aa89b8041a3dfaf1bf7ae8dd7a
Diffstat (limited to 'misc.c')
| -rw-r--r-- | misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.158 2021/01/11 02:12:57 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.159 2021/01/15 02:32:41 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -297,10 +297,10 @@ waitfd(int fd, int *timeoutp, short events) struct timeval t_start; int oerrno, r; - monotime_tv(&t_start); pfd.fd = fd; pfd.events = events; for (; *timeoutp >= 0;) { + monotime_tv(&t_start); r = poll(&pfd, 1, *timeoutp); oerrno = errno; ms_subtract_diff(&t_start, timeoutp); |