[openssh-commits] [openssh] 02/02: upstream: fix channels code spinning on fds for a fraction of a second
git+noreply at mindrot.org
git+noreply at mindrot.org
Thu Oct 15 16:59:23 AEDT 2026
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch V_10_6
in repository openssh.
commit 67a2956392c8859e1225dc98888d6330705cd9a8
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Oct 15 05:50:32 2026 +0000
upstream: fix channels code spinning on fds for a fraction of a second
when ChannelTimeout was in use.
Reported by 하태훈_2184
OpenBSD-Commit-ID: 1afa8fe3e0c961c38148cb2ac94e2aadd033f21c
---
channels.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/channels.c b/channels.c
index ae8b8f6d1..7c74bb675 100644
--- a/channels.c
+++ b/channels.c
@@ -2774,7 +2774,7 @@ channel_handler(struct ssh *ssh, int table, struct timespec *timeout)
if (timeout != NULL &&
c->type == SSH_CHANNEL_OPEN &&
channel_get_expiry(ssh, c) != 0) {
- ptimeout_deadline_monotime(timeout,
+ ptimeout_deadline_monotime_double(timeout,
channel_get_expiry(ssh, c));
}
} else if (timeout != NULL) {
@@ -2782,7 +2782,7 @@ channel_handler(struct ssh *ssh, int table, struct timespec *timeout)
* Arrange for poll() wakeup when channel pause
* timer expires.
*/
- ptimeout_deadline_monotime(timeout,
+ ptimeout_deadline_monotime_double(timeout,
c->notbefore);
}
}
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list