From 04202ca080b49f9e71ccf837854fa03c9e572d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 9 Dec 2020 15:18:29 +0100
Subject: [PATCH 2/2] xwayland: Make sure /tmp/.X11-unix/ exists

When we're running under a polyinstantiated SELinux environment, we'll
likely start with an isolated and empty /tmp, meannig no /tmp/.X11-unix
directory to add things to. To make it possible to still function in
this kind of setup, make sure said directory exists.
---
 src/wayland/meta-xwayland.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 699d5561c7..f6f1010b12 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -436,9 +436,27 @@ meta_xwayland_override_display_number (int number)
   display_number_override = number;
 }
 
+static gboolean
+ensure_x11_unix_dir (GError **error)
+{
+  if (mkdir ("/tmp/.X11-unix", 01777) != 0)
+    {
+      if (errno == EEXIST)
+        return TRUE;
+
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),
+                   "Failed to create directory \"/tmp/.X11-unix\": %s",
+                   g_strerror (errno));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 static gboolean
 choose_xdisplay (MetaXWaylandManager *manager)
 {
+  g_autoptr (GError) error = NULL;
   int display = 0;
   char *lock_file = NULL;
 
@@ -447,10 +465,15 @@ choose_xdisplay (MetaXWaylandManager *manager)
   else if (g_getenv ("RUNNING_UNDER_GDM"))
     display = 1024;
 
-  do
+  if (!ensure_x11_unix_dir (error))
     {
-      g_autoptr (GError) error = NULL;
+      g_warning ("Failed to ensure X11 socket directory: %s",
+                 error->message);
+      return FALSE;
+    }
 
+  do
+    {
       lock_file = create_lock_file (display, &display, &error);
       if (!lock_file)
         {
@@ -466,6 +489,7 @@ choose_xdisplay (MetaXWaylandManager *manager)
           if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_ADDRESS_IN_USE))
             {
               meta_verbose ("Failed to bind abstract socket: %s\n", error->message);
+              g_clear_error (error);
               display++;
               continue;
             }
@@ -480,6 +504,7 @@ choose_xdisplay (MetaXWaylandManager *manager)
       if (manager->unix_fd < 0)
         {
           meta_verbose ("Failed to bind unix socket: %s\n", error->message);
+          g_clear_error (error);
           unlink (lock_file);
           close (manager->abstract_fd);
           display++;
-- 
2.28.0