Message ID | 20200828120138.6869-1-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "cgroup: add missing dput() in cgroup_unmark_ve_roots()" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [74.125.140.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 28 Aug 2020 14:02:36 +0200 (CEST) Received: by 2002:a05:6602:24d9:0:0:0:0 with SMTP id h25csp1269831ioe; Fri, 28 Aug 2020 05:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaPlLPpOo4QoSDCMAEmTpgC/guc9aogHg3VxwqCuQO7vgz/ksMvyyLCh1YrvS40HjJDRVU X-Received: by 2002:a05:651c:233:: with SMTP id z19mr746040ljn.347.1598616151705; Fri, 28 Aug 2020 05:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598616151; cv=none; d=google.com; s=arc-20160816; b=hiKvYQIIPgEoOxTIrFlryFnTkuoflfeyFQbPT21fSq6mKW77N7VjV03b8lbo7wCvsI Pr2mcYgog4x+XYQD49WulX8h6aoLKKEGbT6QqbAbGb8HlE8enACyoaIAzxc3FR3mnqEq VGKGC6BLofiXQTT4c9JuT7TRSyux2NVPaook1lLtNIw/9xsa8ItYjCO/d3i6FY/MV5x/ uEXqahU6gYboEbZXvLiC1RhmGqkDkI2hyp5Wt8pYu2LH6jwjWedlyU5ETGlprpcmhrhr /B3qUTP2j7/fBfIZh8Fah+3YlxdxuNhCU6e1mOtl7tUUnyb+LlVNqN/6UJz+2ggARlFh XKWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from; bh=+e1cpGmWSCQJml7b75r24BuANoLebgT68ZDt6zJSmhk=; b=CVN0mJEIKKPDd9uZBKjDiZ1lGBM/QujMDvdKxPleG3XdIfuCBrP4Cztl6yUoLz377k 8s6llXmXhpP9rF4LHiI03r7FF5ji1SMAbIzPHwh8Ev0gklvTmEDMtamSrkdpAhh96XrI WzLq49+tJ7A6wv7iM6sN8nNlux9O0P74Z+ODBywo14ExTpsxahvH8GmgEgZGCscy72X9 2/yjZXlaRpqNwIyzw42v/ggcXvkmXNZfIftA78s0M9XwHdf6xV+P9+EVgOIO+XrnN64Q qwbLRfGJ2zQ/LzjuYFK1+zCbEzSik3nVU3+7Gx55pJFdPEpLDVfWAwPFsHeoGppkq3cA gy5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id s9si417894ljm.517.2020.08.28.05.02.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2020 05:02:31 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 07SC1sLe032344; Fri, 28 Aug 2020 15:01:57 +0300 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2053.outbound.protection.outlook.com [104.47.2.53]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 07SC1pxP032340 for <devel@openvz.org>; Fri, 28 Aug 2020 15:01:51 +0300 Received: from DB6P195CA0002.EURP195.PROD.OUTLOOK.COM (2603:10a6:4:cb::12) by VE1PR08MB5808.eurprd08.prod.outlook.com (2603:10a6:800:1a1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.21; Fri, 28 Aug 2020 12:01:55 +0000 Received: from DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:cb:cafe::f7) by DB6P195CA0002.outlook.office365.com (2603:10a6:4:cb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Fri, 28 Aug 2020 12:01:55 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay3.sw.ru; Received: from relay3.sw.ru (185.231.240.75) by DB5EUR01FT018.mail.protection.outlook.com (10.152.4.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Fri, 28 Aug 2020 12:01:55 +0000 Received: from [192.168.15.74] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from <aryabinin@virtuozzo.com>) id 1kBd4Q-001VAl-Or; Fri, 28 Aug 2020 15:01:26 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: devel@openvz.org Date: Fri, 28 Aug 2020 15:01:38 +0300 Message-Id: <20200828120138.6869-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 168acf3b-2726-4ccc-ccc1-08d84b4a2898 X-MS-TrafficTypeDiagnostic: VE1PR08MB5808: X-Forefront-Antispam-Report: CIP:185.231.240.75; CTRY:RU; LANG:en; SCL:-1; SRV:; IPV:CAL; SFV:SKN; H:relay3.sw.ru; PTR:relay.sw.ru; CAT:NONE; SFS:; DIR:INB; X-MS-Oob-TLC-OOBClassifiers: OLM:913; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ks/K0XbbHbOIuNuHO8anP/ATgedFTy+dsm5IIICnvEop8W+eklT1jWAavRMe?= =?us-ascii?Q?dKIaV4JaOBw44CDRBJuF0MdEiUf4CfM4TFpEkoy6lbNW0+Th7ZIDTzfbFwyU?= =?us-ascii?Q?rQRlmHrGDIpgE98//Elf+AKWQ98EXUI6d0/VbV1CSeXXGgzQrPZtoXdLLPY+?= =?us-ascii?Q?blqJuv51/QyJaJ6XdZN5fSZyXfJl3u5ZnlJzO399tEnQ7AcTciDTZuy08KCA?= =?us-ascii?Q?fBMqbQMq7RN5ZrKe/NsyPp9iPrXrWOm2NucvgKN4C49WecGbWuiW99CkCR/r?= =?us-ascii?Q?f4z+sugpF5e8+HY7XfLtz3o2qiyfQy4n2dC76MqEfDsBO6i8KFFNfDbDXWn/?= =?us-ascii?Q?VQLbY+I8PBNKv5vLPa70jVbZ9/1T8dO5TmHYK9m32yaJb86Tm16LX69KywRB?= =?us-ascii?Q?54HzAdLATrJ0sNRvnjDl/L2o9wa5VP7J/CbkiW64DIIvJiahZnpmSyczQjCT?= =?us-ascii?Q?AbZqgSmlmvBZR+IcaRqywe+fKF4r4pyRwZnjystXdLF83dz4lFHuU3Fq2rq5?= =?us-ascii?Q?fUOmHB+a7vYWlQF9CAQCmqbQcTiUpfMeaoYobApMjCY1cQA/Be64kKchHdyw?= =?us-ascii?Q?oWERYaFWuFxctH7wOL5i7UA6+YeQd19TOPA+XpqHQs5vXDtydSBNrDjBVQg6?= =?us-ascii?Q?dkVLVYhwIDoF6U17tQByvcmBOHi1gSQCGScw4SZMtoOjcJKpqJdBBQG2NAH2?= =?us-ascii?Q?X7CiuBjUrpIkrjXlFbMXZIMWsKo/ibB136nIOXRo64qUwvCo0JNgi3nIX5qF?= =?us-ascii?Q?3QhPd6sLB6HRN7fYIXkeEx09CzXqvaBvAwg6xHDzqyYZXoxcZXeY2ynGwviY?= =?us-ascii?Q?a1KYvaiYskuFBUi9qtHMgLNypyq75Rfh6bzhBB7R0Zz4ox8YsN2qIKPLRHjL?= =?us-ascii?Q?cRK6mlAOGDNkkupwUAnVq/6n7HNgaDSzSXdpniX1dxFZkx46V/21yTTrklAe?= =?us-ascii?Q?WAidm7Z4LmsiYJ2/oTyXM4THODZpyKnVe6g8ZsE+WwMWHYeWV53CbJEAt9QY?= =?us-ascii?Q?0HFnlQ+p3iECqF8MDX5n90mBMjScf75qjBUD6qeOMOKb+Ykh4/Q2UGZcvoMN?= =?us-ascii?Q?2EsuEnHWh0jeQhCnSkYKZDYd0cUhNUGlp4pMP4j8biHK/PUnuugg7yKxt5d+?= =?us-ascii?Q?m/W3NFOTkXJ1NLp5MgRooMn0pamGpKLHhE0fFMf8uLNeOzA2HE8glJ/FzU+U?= =?us-ascii?Q?rd5wmh+0Nu/NFnVx?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2020 12:01:55.3670 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 168acf3b-2726-4ccc-ccc1-08d84b4a2898 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay3.sw.ru] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5808 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VE1PR08MB5808.eurprd08.prod.outlook.com Subject: [Devel] [PATCH rh7] cgroup: add missing dput() in cgroup_unmark_ve_roots() X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 55713a0071ce..5f3111805eba 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4719,6 +4719,7 @@ void cgroup_unmark_ve_roots(struct ve_struct *ve) mutex_lock(&inode->i_mutex); mutex_lock(&cgroup_mutex); cgroup_rm_file(cgrp, cft); + dput(cgrp->dentry); BUG_ON(!rcu_dereference_protected(cgrp->ve_owner, lockdep_is_held(&cgroup_mutex))); rcu_assign_pointer(cgrp->ve_owner, NULL);
cgroup_unmark_ve_roots() calls dget() on cgroup's dentry but don't have the corresponding dput() call. This leads to leaking cgroups. Add missing dput() to fix this. https://jira.sw.ru/browse/PSBM-107328 Fixes: 1ac69e183447 ("ve/cgroup: added release_agent to each container root cgroup.") Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- kernel/cgroup.c | 1 + 1 file changed, 1 insertion(+)