From b921b8cf0fbc6d532e2ad7e967c431538bd229ce Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 9 Apr 2021 18:32:31 +0200 Subject: [PATCH] cgroup: run all ttys, except rescue sh, in getty cgroup until login Signed-off-by: Joachim Wiberg --- src/exec.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/exec.c b/src/exec.c index db92c136..7b85d7c1 100644 --- a/src/exec.c +++ b/src/exec.c @@ -398,6 +398,8 @@ pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, stru _exit(rc); } + cgroup_user("getty", pid); + return pid; } @@ -419,14 +421,7 @@ pid_t run_getty2(char *tty, char *cmd, char *args[], int noclear, int nowait, st _exit(rc); } - /* - * at this point we're just guessing the username - * would be nice to catch new logins dynamically - * and add them to the correct group, this would - * also work for SSH/Telnet logins. - */ - if (pid > 1) - cgroup_user("root", pid); + cgroup_user("getty", pid); return pid; } @@ -446,8 +441,7 @@ pid_t run_sh(char *tty, int noclear, int nowait, struct rlimit rlimit[]) _exit(rc); } - if (pid > 1) - cgroup_user("root", pid); + cgroup_user("root", pid); return pid; }