[pkg-remote-commits] [xrdp] 01/01: Fix #876976 in stable.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch stretch
in repository xrdp.

commit e556c5cc655ef76c3224e090fa9730ac7fa267f0
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Oct 18 11:58:26 2017 +0200

    Fix #876976 in stable.
---
 debian/changelog                |  8 ++++++++
 debian/patches/fix-876976.patch | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 88990c9..3c208c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xrdp (0.9.1-9+deb9u1) stable; urgency=medium
+
+  * Fix high CPU load on SSL shutdown. (Closes: #876976)
+    + xrdp could in some situations cause permanent high load on a
+      system if an SSL shutdown got into an endless loop.
+
+ -- Dominik George <nik at naturalnet.de>  Wed, 18 Oct 2017 11:56:31 +0200
+
 xrdp (0.9.1-9) unstable; urgency=high
 
   * Revisit incomplete fix for CVE-2017-6967. (Closes: #858143)
diff --git a/debian/patches/fix-876976.patch b/debian/patches/fix-876976.patch
new file mode 100644
index 0000000..b7b3308
--- /dev/null
+++ b/debian/patches/fix-876976.patch
@@ -0,0 +1,16 @@
+From: Jay Sorg <jay.sorg at gmail.com>
+Origin: https://github.com/neutrinolabs/xrdp/commit/2c96908ea500880c71d3593dd2b2b5b5275bdbf5
+Subject: if SSL_shutdown fails, only call one more time
+Bug: https://github.com/neutrinolabs/xrdp/issues/872
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876976
+--- a/common/ssl_calls.c
++++ b/common/ssl_calls.c
+@@ -754,7 +754,7 @@ ssl_tls_disconnect(struct ssl_tls *self)
+         return 0;
+     }
+     status = SSL_shutdown(self->ssl);
+-    while (status != 1)
++    if (status != 1)
+     {
+         status = SSL_shutdown(self->ssl);
+         if (status <= 0)
diff --git a/debian/patches/series b/debian/patches/series
index bd3f630..a2ae49b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ lfs.diff
 kb_jp.diff
 highres.diff
 cve-2017-6967.diff
+fix-876976.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git