From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99896C433E1 for ; Mon, 29 Jun 2020 19:49:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A0752088E for ; Mon, 29 Jun 2020 19:49:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593460178; bh=6PkC7+lZGXPGXlhRK9bOQe75j3/4h5PZW8Cn6tUZsL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yvvV+SgG3crHMRUzSqw1o7z+X/KK0uA5BqU2bU680GHs91t6FwolmIY8J4RQ8usbS BCCNFELpdp7lSZU9S9kpEID0QaQbLT/CqEpWBwxxWc8rkeAE2vNegzIxzxpF0ickvF g8uAEyy/NbHQnp47MQkrifheLSSbsAfAg85ewprg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388215AbgF2Tt1 (ORCPT ); Mon, 29 Jun 2020 15:49:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:47656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387751AbgF2Tkh (ORCPT ); Mon, 29 Jun 2020 15:40:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 370A524928; Mon, 29 Jun 2020 15:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444482; bh=6PkC7+lZGXPGXlhRK9bOQe75j3/4h5PZW8Cn6tUZsL0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X5wubIwOH8phwwvJwayuc8l+OfNwvXnbSHI+vJOnTlMIYgilz3js+jmHuPY5uKb6g J2sLtAZy5++V04w83k/frr3zuXxEypH3N8qcT3iHz2VkI6cxpq50Lq1Zl3oOVX98Mb 7QeZcz0RcrZ+umZraRYw2hep5Wp2vfxhMi87cKZs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Muchun Song , Roman Gushchin , Michal Hocko , Johannes Weiner , Vladimir Davydov , Qian Cai , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 5.4 159/178] mm/memcontrol.c: add missed css_put() Date: Mon, 29 Jun 2020 11:25:04 -0400 Message-Id: <20200629152523.2494198-160-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629152523.2494198-1-sashal@kernel.org> References: <20200629152523.2494198-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.50-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.50-rc1 X-KernelTest-Deadline: 2020-07-01T15:25+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Muchun Song commit 3a98990ae2150277ed34d3b248c60e68bf2244b2 upstream. We should put the css reference when memory allocation failed. Link: http://lkml.kernel.org/r/20200614122653.98829-1-songmuchun@bytedance.com Fixes: f0a3a24b532d ("mm: memcg/slab: rework non-root kmem_cache lifecycle management") Signed-off-by: Muchun Song Acked-by: Roman Gushchin Acked-by: Michal Hocko Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Qian Cai Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memcontrol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0d6f3ea867381..a3f4c35bb5fa0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2895,8 +2895,10 @@ static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, return; cw = kmalloc(sizeof(*cw), GFP_NOWAIT | __GFP_NOWARN); - if (!cw) + if (!cw) { + css_put(&memcg->css); return; + } cw->memcg = memcg; cw->cachep = cachep; -- 2.25.1