isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Make sure /tmp/.X11-unix/ exists

Browse Source 
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.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1626>
This commit is contained in:
Jonas Ådahl 2020-12-09 15:04:56 +01:00
parent d940911478
commit 357f3250cb
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wayland/meta-xwayland.c
View File

@ -30,6 +30,8 @@
#include <glib-unix.h> #include <glib-unix.h>
#include <glib.h> #include <glib.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#if defined(HAVE_SYS_RANDOM) #if defined(HAVE_SYS_RANDOM)
#include <sys/random.h> #include <sys/random.h>
@ -417,6 +419,23 @@ meta_xwayland_override_display_number (int number)
display_number_override = 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 static gboolean
open_display_sockets (MetaXWaylandManager *manager, open_display_sockets (MetaXWaylandManager *manager,
int display_index, int display_index,
@ -425,6 +444,9 @@ open_display_sockets (MetaXWaylandManager *manager,
{ {
int unix_fd; int unix_fd;
if (!ensure_x11_unix_dir (error))
return FALSE;
unix_fd = bind_to_unix_socket (display_index, error); unix_fd = bind_to_unix_socket (display_index, error);
if (unix_fd < 0) if (unix_fd < 0)
return FALSE; return FALSE;