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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C9302C433E0 for ; Wed, 23 Dec 2020 02:47:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FEB62256F for ; Wed, 23 Dec 2020 02:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729647AbgLWCWW (ORCPT ); Tue, 22 Dec 2020 21:22:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:51318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729588AbgLWCWP (ORCPT ); Tue, 22 Dec 2020 21:22:15 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 299CF2313F; Wed, 23 Dec 2020 02:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690094; bh=ReuyCYVYKWAqyVzRSmyl1FHgpc+TAGr/5KNCJDAivjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kZlKE9mRo/VeFkISipAV+Ov6eAisbUmU08GlLel4JvBaLZs5RI/wOi3lGB4Giijhn Xc19/cSJrsgokOSmudpCPbH2PNSip38iODbChx5912KrHtJpW7gOoC3PZfPOTq3XQ6 v8U+rLFVI9kRggCva7kqGGDUbcpPGZLs3uuqxI1inrv7m89kIy9a1HCEcysfNcx9Sr yoWNLxXBRD/wXWKGnqt/NqqZ3RYI/vdP2zMXhWrTSNQQmgMMPb4gmuWjYdjg9R1ELP gJg+PFHoJltWtzdUlICuZN9gW5zYzfBSIeIMb3jv1viaI5R56at7L2HsfWiXATBy5T cM2TtbwgHby/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dinghao Liu , Dave Kleikamp , Sasha Levin , jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 4.19 25/87] jfs: Fix memleak in dbAdjCtl Date: Tue, 22 Dec 2020 21:20:01 -0500 Message-Id: <20201223022103.2792705-25-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022103.2792705-1-sashal@kernel.org> References: <20201223022103.2792705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit 751341b4d7841e2b76e78eec382c2e119165497f ] When dbBackSplit() fails, mp should be released to prevent memleak. It's the same when dbJoin() fails. Signed-off-by: Dinghao Liu Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dmap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 49263e220dbcf..071abfc8e3e50 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -2562,15 +2562,19 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level) */ if (oldval == NOFREE) { rc = dbBackSplit((dmtree_t *) dcp, leafno); - if (rc) + if (rc) { + release_metapage(mp); return rc; + } oldval = dcp->stree[ti]; } dbSplit((dmtree_t *) dcp, leafno, dcp->budmin, newval); } else { rc = dbJoin((dmtree_t *) dcp, leafno, newval); - if (rc) + if (rc) { + release_metapage(mp); return rc; + } } /* check if the root of the current dmap control page changed due -- 2.27.0