aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2013-07-08 19:00:27 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-13 14:42:27 -0400
commit9cafb55474a872531d0b9bf429346912ae5f1153 (patch)
treea6b54d1883ebe50d12942bfb00de17e80f5a0064
parentc02527487f0c8feb578c0394ad481a97f26d3bd2 (diff)
Revert "memcg: avoid dangling reference count in creation failure"
commit fa460c2d37870e0a6f94c70e8b76d05ca11b6db0 upstream. This reverts commit e4715f01be697a. mem_cgroup_put is hierarchy aware so mem_cgroup_put(memcg) already drops an additional reference from all parents so the additional mem_cgrroup_put(parent) potentially causes use-after-free. Signed-off-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Li Zefan <lizefan@huawei.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> Cc: Tejun Heo <tj@kernel.org> Cc: Glauber Costa <glommer@openvz.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--mm/memcontrol.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 194721839cf5..fd79df5d3152 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6303,8 +6303,6 @@ mem_cgroup_css_online(struct cgroup *cont)
6303 * call __mem_cgroup_free, so return directly 6303 * call __mem_cgroup_free, so return directly
6304 */ 6304 */
6305 mem_cgroup_put(memcg); 6305 mem_cgroup_put(memcg);
6306 if (parent->use_hierarchy)
6307 mem_cgroup_put(parent);
6308 } 6306 }
6309 return error; 6307 return error;
6310} 6308}