[openssh-commits] [openssh] branch master updated: upstream: Actually set pollfd.events correctly for socket type

[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.

The following commit(s) were added to refs/heads/master by this push:
     new de24573ef upstream: Actually set pollfd.events correctly for socket type
de24573ef is described below

commit de24573efc60ca145e4f2d7e45787eccf8bd41a4
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 1 05:40:13 2026 +0000

    upstream: Actually set pollfd.events correctly for socket type
    
    channels; previously we were throwing away the events we computed if the
    channel had a c->sock distinct from it's other read and write fds.
    Fortunately, it appears that this case happens rarely, if ever.
    
    Reported by Darafei Praliaskouski via GHPR660
    
    OpenBSD-Commit-ID: d3f483b7919946c5649e8c697d5b927af35aac4b
---
 channels.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels.c b/channels.c
index 949f57765..237ab5639 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.460 2026/05/31 06:14:42 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.461 2026/06/01 05:40:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2863,7 +2863,7 @@ channel_prepare_pollfd(Channel *c, u_int *next_pollfd,
 		if (ev != 0) {
 			c->pfds[3] = p;
 			pfd[p].fd = c->sock;
-			pfd[p].events = 0;
+			pfd[p].events = ev;
 			dump_channel_poll(__func__, "sock", c, p, &pfd[p]);
 			p++;
 		}

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.