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,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 9A7D6C432C0 for ; Fri, 22 Nov 2019 11:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6894C20708 for ; Fri, 22 Nov 2019 11:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421809; bh=sFmxPLvoOWEfl00tsENoIxTweNEQt91iXnciTX2cmDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gU0cpdTE77OjioUJ38QiJxl94wEzzX5OfSwhuFAStA4DNcj79S6R/T30gECuD0SZQ hjqPlGOJOkyP8h/cixdz2df3k5i23w62Y4zDE+XUS9fCSaFtKeOAF6Uj0Uie/jKXlH Gfl2vA+kb/yF///vzJNRuInx55uJNNjyUiYofGg0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728984AbfKVKlO (ORCPT ); Fri, 22 Nov 2019 05:41:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:45672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727648AbfKVKlO (ORCPT ); Fri, 22 Nov 2019 05:41:14 -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 6B8472071C; Fri, 22 Nov 2019 10:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419273; bh=sFmxPLvoOWEfl00tsENoIxTweNEQt91iXnciTX2cmDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tpKd4f6rbOwafNgJVwvjKJcBr9zhAdDliIylGujmo83NBbm2aNZuMQAoNXlL5siH2 WtW6mlmTIaqUc8114SbWsLALHwOV/XV1fTM4Pul4jL0UmnMzojRDmfcM48e/yBCmh3 QL4pm1AIltChR3pvmuMCnG9zUODkRZByj2q8OmDQ= 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.9 055/222] f2fs: fix memory leak of percpu counter in fill_super() Date: Fri, 22 Nov 2019 11:26:35 +0100 Message-Id: <20191122100856.252357588@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 9eff18c1f3e46..e0ac676e0a35c 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1650,8 +1650,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; } /* -- 2.20.1