circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-08 09:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Move cgroup dbus requests to the child

Browse Source 
This avoids a race where a spawned child that quickly forks will have
only the parent process moved to the newly created cgroup, leaving the
early children in tmux's own cgroup.  It also avoids problems if the
spawned process inspects or changes its own cgroup.
This commit is contained in:
Daniel De Graaf 2025-03-25 22:32:19 -04:00
parent 9e1f110db0
commit d34cf29b38
3 changed files with 15 additions and 15 deletions

2
compat.h
View File

@ -450,7 +450,7 @@ void *recallocarray(void *, size_t, size_t, size_t);
/* systemd.c */
int systemd_activated(void);
int systemd_create_socket(int, char **);
int systemd_move_pid_to_new_cgroup(pid_t, char **);
int systemd_move_to_new_cgroup(char **);
#endif
#ifdef HAVE_UTF8PROC

7
compat/systemd.c
View File

@ -76,7 +76,7 @@ fail:
}
int
systemd_move_pid_to_new_cgroup(pid_t pid, char **cause)
systemd_move_to_new_cgroup(char **cause)
{
sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus_message *m = NULL, *reply = NULL;
@ -84,7 +84,7 @@ systemd_move_pid_to_new_cgroup(pid_t pid, char **cause)
char *name, *desc, *slice;
sd_id128_t uuid;
int r;
pid_t parent_pid;
pid_t pid, parent_pid;
/* Connect to the session bus. */
r = sd_bus_default_user(&bus);
@ -138,7 +138,8 @@ systemd_move_pid_to_new_cgroup(pid_t pid, char **cause)
goto finish;
}
parent_pid = getpid();
pid = getpid();
parent_pid = getppid();
xasprintf(&desc, "tmux child pane %ld launched by process %ld",
(long)pid, (long)parent_pid);
r = sd_bus_message_append(m, "(sv)", "Description", "s", desc);

21
spawn.c
View File

@ -382,20 +382,19 @@ spawn_pane(struct spawn_context *sc, char **cause)
/* In the parent process, everything is done now. */
if (new_wp->pid != 0) {
#if defined(HAVE_SYSTEMD) && defined(ENABLE_CGROUPS)
/*
* Move the child process into a new cgroup for systemd-oomd
* isolation.
*/
if (systemd_move_pid_to_new_cgroup(new_wp->pid, cause) < 0) {
log_debug("%s: moving pane to new cgroup failed: %s",
__func__, *cause);
free (*cause);
}
#endif
goto complete;
}
#if defined(HAVE_SYSTEMD) && defined(ENABLE_CGROUPS)
/*
* Move the child process into a new cgroup for systemd-oomd isolation.
*/
if (systemd_move_to_new_cgroup(cause) < 0) {
log_debug("%s: moving pane to new cgroup failed: %s",
__func__, *cause);
free (*cause);
}
#endif
/*
* Child process. Change to the working directory or home if that
* fails.