Merge "cgroupns: Close race between cgroup_post_fork and copy_cgroup_ns" (f239319c) · Commits · e / devices / android_kernel_sony_msm8998

kernel/cgroup.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2799,6 +2799,7 @@ int cgroup_attach_task_all(struct task_struct from, struct task_struct tsk)
		int retval = 0;

		mutex_lock(&cgroup_mutex);
		percpu_down_write(&cgroup_threadgroup_rwsem);
		for_each_root(root) {
		struct cgroup *from_cgrp;

		@@ -2813,6 +2814,7 @@ int cgroup_attach_task_all(struct task_struct from, struct task_struct tsk)
		if (retval)
		break;
		}
		percpu_up_write(&cgroup_threadgroup_rwsem);
		mutex_unlock(&cgroup_mutex);

		return retval;
		@@ -4072,6 +4074,8 @@ int cgroup_transfer_tasks(struct cgroup to, struct cgroup from)

		mutex_lock(&cgroup_mutex);

		percpu_down_write(&cgroup_threadgroup_rwsem);

		/* all tasks in @from are being moved, all csets are source */
		spin_lock_irq(&css_set_lock);
		list_for_each_entry(link, &from->cset_links, cset_link)
		@@ -4100,6 +4104,7 @@ int cgroup_transfer_tasks(struct cgroup to, struct cgroup from)
		} while (task && !ret);
		out_err:
		cgroup_migrate_finish(&preloaded_csets);
		percpu_up_write(&cgroup_threadgroup_rwsem);
		mutex_unlock(&cgroup_mutex);
		return ret;
		}