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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 D5F4BC43215 for ; Tue, 19 Nov 2019 05:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9873122318 for ; Tue, 19 Nov 2019 05:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141457; bh=OORbBAMXynYK2z/1JuxkMgDLq34729Lcgd17vriR7xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oH9yeUOWIVkteTJXigMVtgUdlo13rxcC3usqL1r4bpkwLHnd1DscLF7AeZ/pkD78J 7GGY8vjvi28H8vjAoJx3rhW/imij697QOGPBM8BYBoOYHl1bSUEIALAFQ9XVrng5xN aSvYv/8jocA4e4tqScqul4MBaNucodID1iP8Z+Bw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbfKSFa4 (ORCPT ); Tue, 19 Nov 2019 00:30:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:49766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727906AbfKSFay (ORCPT ); Tue, 19 Nov 2019 00:30:54 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 92C85222A2; Tue, 19 Nov 2019 05:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141454; bh=OORbBAMXynYK2z/1JuxkMgDLq34729Lcgd17vriR7xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x/bO3GIdZ8VVB2FZW6pwGyE241Y7L3nkEGMQzYxC8uRc7R2LbaAX4axQv11sN4lAs RlOGxXWVbVZSBKzvC4ZuRapqSU3tV/WTaHR8WpLzIBuUhbQnqERN9KxD6IlBgmBdJp Qxe/6AHdqjfaxUrw/24BGXJ5scc11Vo4trs+l8to= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.19 166/422] f2fs: fix memory leak of percpu counter in fill_super() Date: Tue, 19 Nov 2019 06:16:03 +0100 Message-Id: <20191119051409.193853097@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit 4a70e255449c9a13eed7a6eeecc85a1ea63cef76 ] In fill_super -> init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 58931d55dc1d2..c5d28e92d146e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2516,8 +2516,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi) if (err) return err; - return percpu_counter_init(&sbi->total_valid_inode_count, 0, + err = percpu_counter_init(&sbi->total_valid_inode_count, 0, GFP_KERNEL); + if (err) + percpu_counter_destroy(&sbi->alloc_valid_block_count); + + return err; } #ifdef CONFIG_BLK_DEV_ZONED -- 2.20.1