diff options
| author |   djm <djm@openbsd.org> | 2014-04-29 13:10:30 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2014-04-29 13:10:30 +0000 |
| commit | e17335f3cfd9e54fe5e1072ffbcc34baf2d014ef (patch) | |
| tree | d2dc45c2e8ab1008fba170e52342272b5b6181e6 /usr.bin/ssh/serverloop.c | |
| parent | Make sure to call uhidev_close() upon detach, plug another xfer leak. (diff) | |
| download | wireguard-openbsd-e17335f3cfd9e54fe5e1072ffbcc34baf2d014ef.tar.xz wireguard-openbsd-e17335f3cfd9e54fe5e1072ffbcc34baf2d014ef.zip | |
bz#1818 - don't send channel success/failre replies on channels that
have sent a close already; analysis and patch from Simon Tatham;
ok markus@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 526fbb99104..8f6e492e009 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.170 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.171 2014/04/29 13:10:30 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1164,7 +1164,7 @@ server_input_channel_req(int type, u_int32_t seq, void *ctxt) } else if ((c->type == SSH_CHANNEL_LARVAL || c->type == SSH_CHANNEL_OPEN) && strcmp(c->ctype, "session") == 0) success = session_input_channel_req(c, rtype); - if (reply) { + if (reply && !(c->flags & CHAN_CLOSE_SENT)) { packet_start(success ? SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); packet_put_int(c->remote_id); |