1 From 8a430bc35d1ee437ce913eefeca1d04d759fc145 Mon Sep 17 00:00:00 2001
   2 From: "djm@openbsd.org" <djm@openbsd.org>
   3 Date: Mon, 21 Sep 2015 04:31:00 +0000
   4 Subject: [PATCH 01/36] upstream commit
   5 
   6 fix possible hang on closed output; bz#2469 reported by Tomas
   7  Kuthan ok markus@
   8 
   9 Upstream-ID: f7afd41810f8540f524284f1be6b970859f94fe3
  10 ---
  11  packet.c | 5 +++--
  12  1 file changed, 3 insertions(+), 2 deletions(-)
  13 
  14 diff --git a/packet.c b/packet.c
  15 index 7b5c419..11fe25c 100644
  16 --- a/packet.c
  17 +++ b/packet.c
  18 @@ -1,4 +1,4 @@
  19 -/* $OpenBSD: packet.c,v 1.214 2015/08/20 22:32:42 deraadt Exp $ */
  20 +/* $OpenBSD: packet.c,v 1.215 2015/09/21 04:31:00 djm Exp $ */
  21  /*
  22   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  23   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  24 @@ -2041,7 +2041,8 @@ ssh_packet_write_wait(struct ssh *ssh)
  25             NFDBITS), sizeof(fd_mask));
  26         if (setp == NULL)
  27                 return SSH_ERR_ALLOC_FAIL;
  28 -       ssh_packet_write_poll(ssh);
  29 +       if ((r = ssh_packet_write_poll(ssh)) != 0)
  30 +               return r;
  31         while (ssh_packet_have_data_to_write(ssh)) {
  32                 memset(setp, 0, howmany(state->connection_out + 1,
  33                     NFDBITS) * sizeof(fd_mask));
  34 -- 
  35 2.5.4 (Apple Git-61)
  36