Skip to content

Commit 2bd1103

Browse files
John Sperbeckhtejun
John Sperbeck
authored andcommitted
cgroup: always put cset in cgroup_css_set_put_fork
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]>
1 parent ab1de7e commit 2bd1103

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
@@ -6486,19 +6486,18 @@ static int cgroup_css_set_fork(struct kernel_clone_args *kargs)
64866486
static void cgroup_css_set_put_fork(struct kernel_clone_args *kargs)
64876487
__releases(&cgroup_threadgroup_rwsem) __releases(&cgroup_mutex)
64886488
{
6489+
struct cgroup *cgrp = kargs->cgrp;
6490+
struct css_set *cset = kargs->cset;
6491+
64896492
cgroup_threadgroup_change_end(current);
64906493

6491-
if (kargs->flags & CLONE_INTO_CGROUP) {
6492-
struct cgroup *cgrp = kargs->cgrp;
6493-
struct css_set *cset = kargs->cset;
6494+
if (cset) {
6495+
put_css_set(cset);
6496+
kargs->cset = NULL;
6497+
}
64946498

6499+
if (kargs->flags & CLONE_INTO_CGROUP) {
64956500
cgroup_unlock();
6496-
6497-
if (cset) {
6498-
put_css_set(cset);
6499-
kargs->cset = NULL;
6500-
}
6501-
65026501
if (cgrp) {
65036502
cgroup_put(cgrp);
65046503
kargs->cgrp = NULL;

0 commit comments

Comments
 (0)