Fix incoming compression statistics (thanks, Russell Coker; closes: #797964).

5 files changed, 38 insertions, 3 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 6c8df34b8..63d964cd3 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-904bc482ad87648a2c799c441dc6a8449f24e15a
-904bc482ad87648a2c799c441dc6a8449f24e15a
+a93e5207256eff3a51db335c5a12b3ad2291f686
+a93e5207256eff3a51db335c5a12b3ad2291f686
 971a7653746a6972b907dfe0ce139c06e4a6f482
 971a7653746a6972b907dfe0ce139c06e4a6f482
 openssh_7.4p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 7be0100c2..428eb30e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.4p1-11) UNRELEASED; urgency=medium
+
+  * Fix incoming compression statistics (thanks, Russell Coker; closes:
+    #797964).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 06 Jun 2017 15:02:33 +0100
+
 openssh (1:7.4p1-10) unstable; urgency=medium
 
   * Move privilege separation directory and PID file from /var/run/ to /run/
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
new file mode 100644
index 000000000..f503baa07
--- /dev/null
+++ b/debian/patches/fix-incoming-compression-statistics.patch
@@ -0,0 +1,27 @@
+From a93e5207256eff3a51db335c5a12b3ad2291f686 Mon Sep 17 00:00:00 2001
+From: Russell Coker <russell@coker.com.au>
+Date: Tue, 6 Jun 2017 15:00:20 +0100
+Subject: Fix incoming compression statistics
+
+Bug-Debian: https://bugs.debian.org/797964
+Forwarded: https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-June/036077.html
+Last-Update: 2017-06-06
+
+Patch-Name: fix-incoming-compression-statistics.patch
+---
+ packet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packet.c b/packet.c
+index ad1f6b49..afcde6f3 100644
+--- a/packet.c
++++ b/packet.c
+@@ -587,7 +587,7 @@ ssh_packet_close(struct ssh *ssh)
+                                deflateEnd(stream);
+                }
+                if (state->compression_in_started) {
+-                       z_streamp stream = &state->compression_out_stream;
++                       z_streamp stream = &state->compression_in_stream;
+                        debug("compress incoming: "
+                            "raw data %llu, compressed %llu, factor %.2f",
+                            (unsigned long long)stream->total_out,
diff --git a/debian/patches/series b/debian/patches/series
index c5fc81486..7537fc157 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ ssh-keygen-hash-corruption.patch
 ssh-keyscan-hash-port.patch
 ssh-keygen-null-deref.patch
 unbreak-unix-forwarding-for-root.patch
+fix-incoming-compression-statistics.patch
diff --git a/packet.c b/packet.c
index ad1f6b497..afcde6f3f 100644
--- a/packet.c
+++ b/packet.c
@@ -587,7 +587,7 @@ ssh_packet_close(struct ssh *ssh)
                                 deflateEnd(stream);
                 }
                 if (state->compression_in_started) {
-                        z_streamp stream = &state->compression_out_stream;
+                        z_streamp stream = &state->compression_in_stream;
                         debug("compress incoming: "
                             "raw data %llu, compressed %llu, factor %.2f",
                             (unsigned long long)stream->total_out,