From patchwork Sat Dec 29 00:04:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 10744707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 273B313BF for ; Sat, 29 Dec 2018 00:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14C78284E9 for ; Sat, 29 Dec 2018 00:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 030F528BFB; Sat, 29 Dec 2018 00:04:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5BA5284E9 for ; Sat, 29 Dec 2018 00:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbeL2AED (ORCPT ); Fri, 28 Dec 2018 19:04:03 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35938 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726193AbeL2AED (ORCPT ); Fri, 28 Dec 2018 19:04:03 -0500 Received: by mail-pg1-f196.google.com with SMTP id n2so10608330pgm.3; Fri, 28 Dec 2018 16:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B77KExBLqz3hkyIa6mBlI3u2GdYhb+GUfUuzHEE1iUg=; b=j7oS2TLV/ccpLe6M3PXgEidvU7HTfsizAxCy6A37sw2PhwNfoesZnJQJdLDSmegb2N JuEMygDvTEKncwyLfrt9EimXuh/+zL01GRueoD4AZyJjl1EdtH61jCpK9Yx61vP/z7rr w9dPD2DxWlsHjYeg0Vr/FNYvfs3fg6bUYSubZbMcjQTv09IonW7rhcNOmnWkpe6vH57h H8O5LpR7+Ip/Jk7zQtQKNaNxgdD/t0urZh3iuCEUam6GMZY3hBX52mCiZxBO4pPRLecy IH6gPyMnvSXha4xyCD0d1FcXn1oOfSJzjCIHEM67/HP5K/J3esh9jLfViwjRz2iF2Z48 CPpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B77KExBLqz3hkyIa6mBlI3u2GdYhb+GUfUuzHEE1iUg=; b=G+MIBzhyhyL/vgsvrxhBn38fzBb0OFjKNDAiEDwzMUzU/Qb9J+IGP0KV8zA+91f6Cc A7ziHkNv9Yr1mHmBWTSm4juX9kdHf1co9/1OyubuULcwvyG9urAxt6hRw+xQrguKy9YO SeLQk8NXGBsfczGq13Vk3qf+cd0aOcDc897H2nUjvQZaJCKvqMh7wTVq2Fg7S/QWdftD mqDssIujfPTH3WLx6c4ftbza6DwESO8pZI+FuIC/Sd5SrXapubEJg/ofX6feKSO0cf3l 4xd/9p0/oPZsBNZlx1uO6QL1T5J71aYvWt8F1bLgzlinwdxPEiFR0uExiTDrN6+Zc/fb yO3Q== X-Gm-Message-State: AA+aEWaGxFyLE5llkoudiJNdSWsjeVjmc3Kg37+ndinm1K3AVjeC6ch+ 1Oscniy3qyBWuQ6tUYHCrD0= X-Google-Smtp-Source: AFSGD/W982nyfvkAIlrewsqqy+yGVRnO/q0riRDFMOas1fVcHZtYtGL1bEvcAexccZinWqTZ8+h3vQ== X-Received: by 2002:a62:4714:: with SMTP id u20mr29685722pfa.144.1546041842609; Fri, 28 Dec 2018 16:04:02 -0800 (PST) Received: from localhost.localdomain ([2620:0:1008:fd00:78b4:3a07:980a:287b]) by smtp.gmail.com with ESMTPSA id t5sm60843364pfb.60.2018.12.28.16.04.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Dec 2018 16:04:02 -0800 (PST) From: Andrei Vagin To: Alexander Viro , David Howells Cc: linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Andrei Vagin , Li Zefan Subject: [PATCH vfs/for-next v2] cgroup: fix top cgroup refcnt leak Date: Fri, 28 Dec 2018 16:04:00 -0800 Message-Id: <20181229000400.26333-1-avagin@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181228235900.21468-1-avagin@gmail.com> References: <20181228235900.21468-1-avagin@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- v2: clean up code and add the vfs/for-next tag kernel/cgroup/cgroup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index fb0717696895..f63974a3725f 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -2047,6 +2047,9 @@ int cgroup_do_get_tree(struct fs_context *fc) ret = 0; if (ctx->kfc.new_sb_created) goto out_cgrp; + else + cgroup_put(&ctx->root->cgrp); + apply_cgroup_root_flags(ctx->flags); return 0;