From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f193.google.com ([209.85.215.193]:37652 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726173AbeL1X7E (ORCPT ); Fri, 28 Dec 2018 18:59:04 -0500 From: Andrei Vagin To: Alexander Viro , David Howells Cc: linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Andrei Vagin , Li Zefan Subject: [PATCH] cgroup: fix top cgroup refcnt leak Date: Fri, 28 Dec 2018 15:59:00 -0800 Message-Id: <20181228235900.21468-1-avagin@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: It looks like the c6b3d5bcd67c ("cgroup: fix top cgroup refcnt leak") commit was reverted by mistake. $ mkdir /tmp/cgroup $ mkdir /tmp/cgroup2 $ mount -t cgroup -o none,name=test test /tmp/cgroup $ mount -t cgroup -o none,name=test test /tmp/cgroup2 $ umount /tmp/cgroup $ umount /tmp/cgroup2 $ cat /proc/self/cgroup | grep test 12:name=test:/ You can see the test cgroup was not freed. Cc: Li Zefan Fixes: aea3f2676c83 ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context") Signed-off-by: Andrei Vagin --- kernel/cgroup/cgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index fb0717696895..dbb8805bf66c 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -2045,8 +2045,11 @@ int cgroup_do_get_tree(struct fs_context *fc) } ret = 0; - if (ctx->kfc.new_sb_created) + if (ctx->kfc.new_sb_created) { goto out_cgrp; + } else { + cgroup_put(&ctx->root->cgrp); + } apply_cgroup_root_flags(ctx->flags); return 0; -- 2.17.2