[openssh-commits] [openssh] 01/02: upstream: fix channels code spinning on fds for a fraction of a second

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 81167342ce3fb317529f81716e62979dd08685c5
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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/channels.c b/channels.c
index 15ec05130..936ec3779 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.471 2026/10/11 20:45:25 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.472 2026/10/15 05:50:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -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.