xserver: Branch 'master'

[Adam Jackson]

 os/inputthread.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 71348e99a8e6a95542e483b93839168ca8f51f81
Author: Michal Srb <msrb at suse.com>
Date:   Mon Nov 27 09:59:01 2017 +0100

    os/inputthread: Force unlock when stopping thread.
    
    The inputthread is kept locked all the time while X server's VT is not active.
    If the X server is terminated while not active, it will be stuck forever in
    InputThreadFini waiting for the thread to join, but it wouldn't because it is
    locked.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103782
    Signed-off-by: Michal Srb <msrb at suse.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/os/inputthread.c b/os/inputthread.c
index e7159c70a..97e59d21f 100644
--- a/os/inputthread.c
+++ b/os/inputthread.c
@@ -499,6 +499,7 @@ InputThreadFini(void)
 
     /* Close the pipe to get the input thread to shut down */
     close(hotplugPipeWrite);
+    input_force_unlock();
     pthread_join(inputThreadInfo->thread, NULL);
 
     xorg_list_for_each_entry_safe(dev, next, &inputThreadInfo->devs, node) {