The patch titled freezer_cg: fix improper BUG_ON() causing oops has been removed from the -mm tree. Its filename was freezer_cg-fix-improper-bug_on-causing-oops.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: freezer_cg: fix improper BUG_ON() causing oops From: Li Zefan <lizf@xxxxxxxxxxxxxx> The BUG_ON() should be protected by freezer->lock, otherwise it can be triggered easily when a task has been unfreezed but the corresponding cgroup hasn't been changed to FROZEN state. Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx> Acked-by: Cedric Le Goater <clg@xxxxxxxxxx> Acked-by: Matt Helsley <matthltc@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/cgroup_freezer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN kernel/cgroup_freezer.c~freezer_cg-fix-improper-bug_on-causing-oops kernel/cgroup_freezer.c --- a/kernel/cgroup_freezer.c~freezer_cg-fix-improper-bug_on-causing-oops +++ a/kernel/cgroup_freezer.c @@ -190,8 +190,9 @@ static void freezer_fork(struct cgroup_s freezer = task_freezer(task); task_unlock(task); - BUG_ON(freezer->state == CGROUP_FROZEN); spin_lock_irq(&freezer->lock); + BUG_ON(freezer->state == CGROUP_FROZEN); + /* Locking avoids race with FREEZING -> THAWED transitions. */ if (freezer->state == CGROUP_FREEZING) freeze_task(task, true); _ Patches currently in -mm which might be from lizf@xxxxxxxxxxxxxx are cgroups-fix-invalid-cgrp-dentry-before-cgroup-has-been-completely-removed.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html