summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2013-01-24 14:43:28 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-04 06:06:44 +0800
commit916b6c67cd471fafa3e5e53ce8389c36749ed6f1 (patch)
tree72cc7d232c2d88d38d5475da41c7ae49826649f7 /kernel
parenta74e9a386f6e775f88061f7958b8b34c6742f926 (diff)
downloadlinux-3.10-916b6c67cd471fafa3e5e53ce8389c36749ed6f1.tar.gz
linux-3.10-916b6c67cd471fafa3e5e53ce8389c36749ed6f1.tar.bz2
linux-3.10-916b6c67cd471fafa3e5e53ce8389c36749ed6f1.zip
cgroup: fix exit() vs rmdir() race
commit 71b5707e119653039e6e95213f00479668c79b75 upstream. In cgroup_exit() put_css_set_taskexit() is called without any lock, which might lead to accessing a freed cgroup: thread1 thread2 --------------------------------------------- exit() cgroup_exit() put_css_set_taskexit() atomic_dec(cgrp->count); rmdir(); /* not safe !! */ check_for_release(cgrp); rcu_read_lock() can be used to make sure the cgroup is alive. Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index a5dccd4c236..a4c47d1b3ce 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -378,12 +378,20 @@ static void __put_css_set(struct css_set *cg, int taskexit)
struct cgroup *cgrp = link->cgrp;
list_del(&link->cg_link_list);
list_del(&link->cgrp_link_list);
+
+ /*
+ * We may not be holding cgroup_mutex, and if cgrp->count is
+ * dropped to 0 the cgroup can be destroyed at any time, hence
+ * rcu_read_lock is used to keep it alive.
+ */
+ rcu_read_lock();
if (atomic_dec_and_test(&cgrp->count) &&
notify_on_release(cgrp)) {
if (taskexit)
set_bit(CGRP_RELEASABLE, &cgrp->flags);
check_for_release(cgrp);
}
+ rcu_read_unlock();
kfree(link);
}