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@

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 3201b8a..b5227e6 100644 (file)
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.259 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
@@ -2036,7 +2036,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
                }
                packet_check_eom();
        }
-       if (reply && c != NULL) {
+       if (reply && c != NULL && !(c->flags & CHAN_CLOSE_SENT)) {
                packet_start(success ?
                    SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
                packet_put_int(c->remote_id);

diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 526fbb9..8f6e492 100644 (file)
--- 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);