Merge pull request #136 from gicmo/sandbox_root

Use readlink instead of realpath so find_exe works for flatpaks
This commit is contained in:
Alex Smith 2019-05-07 09:15:56 +01:00 committed by GitHub
commit 67c7aa04d6
4 changed files with 85 additions and 4 deletions

View File

@ -40,10 +40,14 @@ POSSIBILITY OF SUCH DAMAGE.
#include "helpers.h"
#include "logging.h"
#include <fcntl.h>
#include <pthread.h>
#include <signal.h>
#include <stdatomic.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <systemd/sd-daemon.h>
#include <unistd.h>
/**
* The GameModeClient encapsulates the remote connection, providing a list
@ -650,15 +654,31 @@ static char *game_mode_context_find_exe(pid_t pid)
{
char buffer[PATH_MAX];
char *proc_path = NULL, *wine_exe = NULL;
autoclose_fd int pidfd = -1;
ssize_t r;
if (!(proc_path = buffered_snprintf(buffer, "/proc/%d/exe", pid)))
if (!(proc_path = buffered_snprintf(buffer, "/proc/%d", pid)))
goto fail;
/* Allocate the realpath if possible */
char *exe = realpath(proc_path, NULL);
if (!exe)
/* Translate /proc/<pid>/exe to the application binary */
pidfd = openat(AT_FDCWD, proc_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
if (pidfd == -1)
goto fail;
r = readlinkat(pidfd, "exe", buffer, sizeof(buffer));
if (r == sizeof(buffer)) {
errno = ENAMETOOLONG;
r = -1;
}
if (r == -1)
goto fail;
buffer[r] = '\0';
char *exe = strdup(buffer);
/* Detect if the process is a wine loader process */
if (game_mode_detect_wine_preloader(exe)) {
LOG_MSG("Detected wine preloader for client %d [%s].\n", pid, exe);

41
daemon/helpers.c Normal file
View File

@ -0,0 +1,41 @@
/*
Copyright (c) 2017-2019, Feral Interactive
Copyright (c) 2019, Red Hat
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Feral Interactive nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#define _GNU_SOURCE
#include "helpers.h"
/* Starting with C99 we can use "inline" without "static" and thus avoid
* having multiple (local) definitions of the same inline function. One
* consequence of that is that if the compiler decides to *not* inline
* a specific call to the function the linker will expect an definition.
*/
extern inline void cleanup_close(int *fd);

View File

@ -34,6 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <string.h>
#include <sys/param.h>
#include <unistd.h>
/**
* Value clamping helper, works like MIN/MAX but constraints a value within the range.
@ -62,3 +63,21 @@ static inline const char *strtail(const char *haystack, const char *needle)
return pos;
return NULL;
}
/**
* Helper function for autoclosing file-descriptors. Does nothing if the argument
* is NULL or the referenced integer < 0.
*/
inline void cleanup_close(int *fd_ptr)
{
if (fd_ptr == NULL || *fd_ptr < 0)
return;
(void)close(*fd_ptr);
}
/**
* Helper macro for autoclosing file-descriptors: use by prefixing the variable,
* like "autoclose_fd int fd = -1;".
*/
#define autoclose_fd __attribute__((cleanup(cleanup_close)))

View File

@ -30,6 +30,7 @@ daemon_sources = [
'daemonize.c',
'dbus_messaging.c',
'daemon_config.c',
'helpers.c',
]
gamemoded_includes = libgamemode_includes