Skip to content

Commit c68b4db

Browse files
John Sperbeckgregkh
John Sperbeck
authored andcommitted
cgroup: always put cset in cgroup_css_set_put_fork
[ Upstream commit 2bd1103 ] A successful call to cgroup_css_set_fork() will always have taken a ref on kargs->cset (regardless of CLONE_INTO_CGROUP), so always do a corresponding put in cgroup_css_set_put_fork(). Without this, a cset and its contained css structures will be leaked for some fork failures. The following script reproduces the leak for a fork failure due to exceeding pids.max in the pids controller. A similar thing can happen if we jump to the bad_fork_cancel_cgroup label in copy_process(). [ -z "$1" ] && echo "Usage $0 pids-root" && exit 1 PID_ROOT=$1 CGROUP=$PID_ROOT/foo [ -e $CGROUP ] && rmdir -f $CGROUP mkdir $CGROUP echo 5 > $CGROUP/pids.max echo $$ > $CGROUP/cgroup.procs fork_bomb() { set -e for i in $(seq 10); do /bin/sleep 3600 & done } (fork_bomb) & wait echo $$ > $PID_ROOT/cgroup.procs kill $(cat $CGROUP/cgroup.procs) rmdir $CGROUP Fixes: ef2c41c ("clone3: allow spawning processes into cgroups") Cc: [email protected] # v5.7+ Signed-off-by: John Sperbeck <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 7a2e2ca commit c68b4db

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

kernel/cgroup/cgroup.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6471,19 +6471,18 @@ static int cgroup_css_set_fork(struct kernel_clone_args *kargs)
64716471
static void cgroup_css_set_put_fork(struct kernel_clone_args *kargs)
64726472
__releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex)
64736473
{
6474+
struct cgroup *cgrp = kargs->cgrp;
6475+
struct css_set *cset = kargs->cset;
6476+
64746477
cgroup_threadgroup_change_end(current);
64756478

6476-
if (kargs->flags & CLONE_INTO_CGROUP) {
6477-
struct cgroup *cgrp = kargs->cgrp;
6478-
struct css_set *cset = kargs->cset;
6479+
if (cset) {
6480+
put_css_set(cset);
6481+
kargs->cset = NULL;
6482+
}
64796483

6484+
if (kargs->flags & CLONE_INTO_CGROUP) {
64806485
cgroup_unlock();
6481-
6482-
if (cset) {
6483-
put_css_set(cset);
6484-
kargs->cset = NULL;
6485-
}
6486-
64876486
if (cgrp) {
64886487
cgroup_put(cgrp);
64896488
kargs->cgrp = NULL;

0 commit comments

Comments
 (0)