From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 30 Jun 2015 05:23:25 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2;p=thirdparty%2Fopenssh-portable.git

upstream commit

Fix math error in remote window calculations that causes
 eventual stalls for datagram channels. Reported by Georg Wicherski, ok
 markus@

Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab
---

diff --git a/channels.c b/channels.c
index 45e1f9fcc..8069cf1f9 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.344 2015/06/05 15:13:13 millert Exp $ */
+/* $OpenBSD: channels.c,v 1.345 2015/06/30 05:23:25 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2270,7 +2270,7 @@ channel_output_poll(void)
 					packet_put_int(c->remote_id);
 					packet_put_string(data, dlen);
 					packet_send();
-					c->remote_window -= dlen + 4;
+					c->remote_window -= dlen;
 					free(data);
 				}
 				continue;