mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: fix leak in flatpak detection

Browse source
This commit is contained in:
Wim Taymans 2021-04-06 11:26:02 +02:00
parent 78db493d0d
commit 09243d55ae
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -5823,7 +5823,7 @@ static int check_flatpak(struct client *client, int pid)
struct stat stat_buf; struct stat stat_buf;
sprintf(root_path, "/proc/%u/root", pid); sprintf(root_path, "/proc/%u/root", pid);
root_fd = openat (AT_FDCWD, root_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY); root_fd = openat(AT_FDCWD, root_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
if (root_fd == -1) { if (root_fd == -1) {
res = -errno; res = -errno;
if (res == -EACCES) { if (res == -EACCES) {
@ -5842,8 +5842,8 @@ static int check_flatpak(struct client *client, int pid)
pw_log_info("failed to open \"%s\": %s", root_path, spa_strerror(res)); pw_log_info("failed to open \"%s\": %s", root_path, spa_strerror(res));
return res; return res;
} }
info_fd = openat (root_fd, ".flatpak-info", O_RDONLY | O_CLOEXEC | O_NOCTTY); info_fd = openat(root_fd, ".flatpak-info", O_RDONLY | O_CLOEXEC | O_NOCTTY);
close (root_fd); close(root_fd);
if (info_fd == -1) { if (info_fd == -1) {
if (errno == ENOENT) { if (errno == ENOENT) {
pw_log_debug("no .flatpak-info, client on the host"); pw_log_debug("no .flatpak-info, client on the host");
@ -5854,11 +5854,11 @@ static int check_flatpak(struct client *client, int pid)
pw_log_error("error opening .flatpak-info: %m"); pw_log_error("error opening .flatpak-info: %m");
return res; return res;
} }
if (fstat (info_fd, &stat_buf) != 0 || !S_ISREG (stat_buf.st_mode)) { if (fstat(info_fd, &stat_buf) != 0 || !S_ISREG(stat_buf.st_mode)) {
/* Some weird fd => failure, assume sandboxed */ /* Some weird fd => failure, assume sandboxed */
close(info_fd);
pw_log_error("error fstat .flatpak-info: %m"); pw_log_error("error fstat .flatpak-info: %m");
} }
close(info_fd);
return 1; return 1;
} }