[pkg-remote-commits] [xrdp] 01/01: Revisit fix for CVE-2017-6967.

[Dominik George]

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

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

commit 4c1ca9db53aa048348da866f40be3024ac61a515
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Apr 27 12:34:23 2017 +0200

    Revisit fix for CVE-2017-6967.
---
 debian/changelog                  |  6 ++++++
 debian/patches/cve-2017-6967.diff | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8aa2d92..cb7c144 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xrdp (0.9.1-9) unstable; urgency=medium
+
+  * Revisit incomplete fix for CVE-2017-6967. (Closes: #858143)
+
+ -- Dominik George <nik at naturalnet.de>  Thu, 27 Apr 2017 12:33:21 +0200
+
 xrdp (0.9.1-8) unstable; urgency=medium
 
   * Fix CVE-2017-6967. (Closes: #858143, #855536)
diff --git a/debian/patches/cve-2017-6967.diff b/debian/patches/cve-2017-6967.diff
index fd50b28..d26bfb7 100644
--- a/debian/patches/cve-2017-6967.diff
+++ b/debian/patches/cve-2017-6967.diff
@@ -89,3 +89,30 @@ Origin: https://github.com/neutrinolabs/xrdp/commit/4b8a33e087ee9cf5556b40b717cd
      g_free(slist);
  }
  
+--- a/sesman/session.c
++++ b/sesman/session.c
+@@ -490,6 +490,7 @@ session_start_fork(tbus data, tui8 type,
+         return 0;
+     }
+ 
++    auth_start_session(data, display);
+     pid = g_fork(); /* parent is fork from tcp accept,
+                        child forks X and wm, then becomes scp */
+ 
+@@ -639,7 +640,6 @@ session_start_fork(tbus data, tui8 type,
+             else
+             {
+                 g_waitpid(pampid);
+-                auth_stop_session(data);
+                 g_deinit();
+                 g_exit(0);
+             }
+@@ -967,6 +967,8 @@ session_kill(int pid)
+ 
+         if (tmp->item->pid == pid)
+         {
++            auth_stop_session(tmp->item->data);
++            auth_end(tmp->item->data);
+             /* deleting the session */
+             log_message(LOG_LEVEL_INFO, "++ terminated session:  username %s, display :%d.0, session_pid %d, ip %s", tmp->item->name, tmp->item->display, tmp->item->pid, tmp->item->client_ip);
+             g_free(tmp->item);

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