]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - kernel/cgroup.c
cgroupns: Fix the locking in copy_cgroup_ns
authorEric W. Biederman <ebiederm@xmission.com>
Fri, 15 Jul 2016 11:35:24 +0000 (06:35 -0500)
committerTejun Heo <tj@kernel.org>
Fri, 15 Jul 2016 11:56:32 +0000 (07:56 -0400)
commit7bd8830875bfa380c68f390efbad893293749324
tree86f51feccb725f56d42fd3cca7e256a787cfec13
parent82d6489d0fed2ec8a8c48c19e8d8a04ac8e5bb26
cgroupns: Fix the locking in copy_cgroup_ns

If "clone(CLONE_NEWCGROUP...)" is called it results in a nice lockdep
valid splat.

In __cgroup_proc_write the lock ordering is:
     cgroup_mutex -- through cgroup_kn_lock_live
     cgroup_threadgroup_rwsem

In copy_process the guts of clone the lock ordering is:
     cgroup_threadgroup_rwsem -- through threadgroup_change_begin
     cgroup_mutex -- through copy_namespaces -- copy_cgroup_ns

lockdep reports some a different call chains for the first ordering of
cgroup_mutex and cgroup_threadgroup_rwsem but it is harder to trace.
This is most definitely deadlock potential under the right
circumstances.

Fix this by by skipping the cgroup_mutex and making the locking in
copy_cgroup_ns mirror the locking in cgroup_post_fork which also runs
during fork under the cgroup_threadgroup_rwsem.

Cc: stable@vger.kernel.org
Fixes: a79a908fd2b0 ("cgroup: introduce cgroup namespaces")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/cgroup.c