tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/01/27 13:26:17 

[mux.c]
     fix bug introduced in mux rewrite:

     In a mux master, when a socket to a mux slave closes before its server
     session (as may occur when the slave has been signalled), gracefully
     close the server session rather than deleting its channel immediately.
     A server may have more messages on that channel to send (e.g. an exit
     message) that will fatal() the client if they are sent to a channel that
     has been prematurely deleted.

     spotted by imorgan AT nas.nasa.gov
This commit is contained in:
Damien Miller 2010-01-28 06:26:59 +11:00
parent 45a81a0e18
commit a21cdfac2f
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -4,6 +4,18 @@
[mux.c] [mux.c]
-Wuninitialized and remove a // comment; from portable -Wuninitialized and remove a // comment; from portable
(Id sync only) (Id sync only)
- djm@cvs.openbsd.org 2010/01/27 13:26:17
[mux.c]
fix bug introduced in mux rewrite:
In a mux master, when a socket to a mux slave closes before its server
session (as may occur when the slave has been signalled), gracefully
close the server session rather than deleting its channel immediately.
A server may have more messages on that channel to send (e.g. an exit
message) that will fatal() the client if they are sent to a channel that
has been prematurely deleted.
spotted by imorgan AT nas.nasa.gov
20100126 20100126
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

10
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.11 2010/01/26 02:15:20 djm Exp $ */ /* $OpenBSD: mux.c,v 1.12 2010/01/27 13:26:17 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -210,7 +210,13 @@ mux_master_control_cleanup_cb(int cid, void *unused)
__func__, c->self, c->remote_id); __func__, c->self, c->remote_id);
c->remote_id = -1; c->remote_id = -1;
sc->ctl_chan = -1; sc->ctl_chan = -1;
chan_mark_dead(sc); if (sc->type != SSH_CHANNEL_OPEN) {
debug2("%s: channel %d: not open", __func__, sc->self);
chan_mark_dead(c);
} else {
chan_read_failed(sc);
chan_write_failed(sc);
}
} }
channel_cancel_cleanup(c->self); channel_cancel_cleanup(c->self);
} }