frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow full paths to sockets on non-macOS 

When combined with xorg/lib/libxtrans!7, this allows CVE-2020-25697 to
be mitigated by placing the AF_UNIX socket in a secure directory on the
filesystem.

This enables HAVE_LAUNCHD unconditionally and deletes the configure
switch.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
This commit is contained in:
Demi Marie Obenour 2022-07-03 17:57:11 -04:00
parent 18e109d755
commit ccdef1a8a5
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -247,16 +247,6 @@ XCB_EXTENSION(XTest, yes)
XCB_EXTENSION(Xv, yes) XCB_EXTENSION(Xv, yes)
XCB_EXTENSION(XvMC, yes) XCB_EXTENSION(XvMC, yes)
AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
if test "x$LAUNCHD" = xauto; then
unset LAUNCHD
AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no], [$PATH$PATH_SEPARATOR/sbin])
fi
if test "x$LAUNCHD" = xyes ; then
AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
fi
AC_ARG_WITH(serverside-support, AS_HELP_STRING([--with-serverside-support], [Build with support for server-side usage of xcb. This is still EXPERIMENTAL! ABI/API may change! (default: no)]), [XCB_SERVERSIDE_SUPPORT=$withval], [XCB_SERVERSIDE_SUPPORT=no]) AC_ARG_WITH(serverside-support, AS_HELP_STRING([--with-serverside-support], [Build with support for server-side usage of xcb. This is still EXPERIMENTAL! ABI/API may change! (default: no)]), [XCB_SERVERSIDE_SUPPORT=$withval], [XCB_SERVERSIDE_SUPPORT=no])
AM_CONDITIONAL(XCB_SERVERSIDE_SUPPORT, test "x$XCB_SERVERSIDE_SUPPORT" = "xyes") AM_CONDITIONAL(XCB_SERVERSIDE_SUPPORT, test "x$XCB_SERVERSIDE_SUPPORT" = "xyes")

22
src/xcb_util.c
View File

@ -60,9 +60,7 @@
# include <sys/stat.h> # include <sys/stat.h>
#endif #endif
#ifdef HAVE_LAUNCHD
#include <sys/stat.h> #include <sys/stat.h>
#endif
int xcb_popcount(uint32_t mask) int xcb_popcount(uint32_t mask)
{ {
@ -82,7 +80,6 @@ int xcb_sumof(uint8_t *list, int len)
return s; return s;
} }
#ifdef HAVE_LAUNCHD
/* Return true and parse if name matches <path to socket>[.<screen>] /* Return true and parse if name matches <path to socket>[.<screen>]
* Upon success: * Upon success:
* host = <path to socket> * host = <path to socket>
@ -95,9 +92,15 @@ static int _xcb_parse_display_path_to_socket(const char *name, char **host, char
{ {
struct stat sbuf; struct stat sbuf;
char path[PATH_MAX]; char path[PATH_MAX];
size_t len;
int _screen = 0; int _screen = 0;
strlcpy(path, name, sizeof(path)); if (name[0] != '/')
return 0;
len = strlen(name);
if (len >= sizeof(path))
return 0;
memcpy(path, name, len + 1);
if (0 != stat(path, &sbuf)) { if (0 != stat(path, &sbuf)) {
char *dot = strrchr(path, '.'); char *dot = strrchr(path, '.');
if (!dot) if (!dot)
@ -133,7 +136,6 @@ static int _xcb_parse_display_path_to_socket(const char *name, char **host, char
return 1; return 1;
} }
#endif
static int _xcb_parse_display(const char *name, char **host, char **protocol, static int _xcb_parse_display(const char *name, char **host, char **protocol,
int *displayp, int *screenp) int *displayp, int *screenp)
@ -146,11 +148,9 @@ static int _xcb_parse_display(const char *name, char **host, char **protocol,
if(!name) if(!name)
return 0; return 0;
#ifdef HAVE_LAUNCHD
/* First check for <path to socket>[.<screen>] */ /* First check for <path to socket>[.<screen>] */
if (_xcb_parse_display_path_to_socket(name, host, protocol, displayp, screenp)) if (_xcb_parse_display_path_to_socket(name, host, protocol, displayp, screenp))
return 1; return 1;
#endif
slash = strrchr(name, '/'); slash = strrchr(name, '/');
@ -235,6 +235,7 @@ static int _xcb_open(const char *host, char *protocol, const int display)
size_t filelen; size_t filelen;
char *file = NULL; char *file = NULL;
int actual_filelen; int actual_filelen;
struct stat sbuf;
/* If protocol or host is "unix", fall through to Unix socket code below */ /* If protocol or host is "unix", fall through to Unix socket code below */
if ((!protocol || (strcmp("unix",protocol) != 0)) && if ((!protocol || (strcmp("unix",protocol) != 0)) &&
@ -250,7 +251,6 @@ static int _xcb_open(const char *host, char *protocol, const int display)
/* Check special path for Unix sockets under Solaris Trusted Extensions */ /* Check special path for Unix sockets under Solaris Trusted Extensions */
if (is_system_labeled()) if (is_system_labeled())
{ {
struct stat sbuf;
const char *tsol_base = "/var/tsol/doors/.X11-unix/X"; const char *tsol_base = "/var/tsol/doors/.X11-unix/X";
char tsol_socket[PATH_MAX]; char tsol_socket[PATH_MAX];
@ -261,16 +261,12 @@ static int _xcb_open(const char *host, char *protocol, const int display)
} }
#endif #endif
#ifdef HAVE_LAUNCHD
struct stat sbuf;
if (0 == stat(host, &sbuf)) { if (0 == stat(host, &sbuf)) {
file = strdup(host); file = strdup(host);
if(file == NULL) if(file == NULL)
return -1; return -1;
filelen = actual_filelen = strlen(file); filelen = actual_filelen = strlen(file);
} else } else {
#endif
{
filelen = strlen(base) + 1 + sizeof(display) * 3 + 1; filelen = strlen(base) + 1 + sizeof(display) * 3 + 1;
file = malloc(filelen); file = malloc(filelen);
if(file == NULL) if(file == NULL)