dilim/openssh-portable
1
0 Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-11-06 05:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: more completely close mux fds when the owning process

Browse Source 
goes away. Avoid case where the server could still write stderr data while in
the DRAIN state if it never sent a CLOSE

Anthropic ANT-2026-T8GUCMJY

OpenBSD-Commit-ID: 061eaf51dee48212651ffaa9df46f915bc6494d1
This commit is contained in:
djm@openbsd.org authored and Damien Miller committed 2026-10-30 20:18:07 +11:00
1 parent bb7ffdd796
commit 170dfa9cdd
1 file changed
+10 -2
Download Patch File Download Diff File Expand all files Collapse all files
mux.c
+10 -2
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.117 2026/10/30 07:25:33 djm Exp $ */
/* $OpenBSD: mux.c,v 1.118 2026/10/30 08:27:49 djm Exp $ */
/*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
*
@@ -222,8 +222,16 @@ mux_master_control_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused)
} else {
if (sc->istate == CHAN_INPUT_OPEN)
chan_read_failed(ssh, sc);
if (sc->ostate == CHAN_OUTPUT_OPEN)
if (sc->ostate == CHAN_OUTPUT_OPEN ||
sc->ostate == CHAN_OUTPUT_WAIT_DRAIN)
chan_write_failed(ssh, sc);
/*
* Also close the client's stderr, otherwise the
* server could keep writing extended data to it
* until the channel is fully closed.
*/
if (sc->efd != -1)
channel_close_fd(ssh, sc, &sc->efd);
}
}
channel_cancel_cleanup(ssh, c->self);