Skip to content

Commit de24573

Browse files
committed
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
1 parent 58b9381 commit de24573

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

channels.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: channels.c,v 1.460 2026/05/31 06:14:42 djm Exp $ */
1+
/* $OpenBSD: channels.c,v 1.461 2026/06/01 05:40:13 djm Exp $ */
22
/*
33
* Author: Tatu Ylonen <ylo@cs.hut.fi>
44
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2863,7 +2863,7 @@ channel_prepare_pollfd(Channel *c, u_int *next_pollfd,
28632863
if (ev != 0) {
28642864
c->pfds[3] = p;
28652865
pfd[p].fd = c->sock;
2866-
pfd[p].events = 0;
2866+
pfd[p].events = ev;
28672867
dump_channel_poll(__func__, "sock", c, p, &pfd[p]);
28682868
p++;
28692869
}

0 commit comments

Comments
 (0)