From: Dinghao Liu <dinghao.liu@zju.edu.cn>
Date: Thu, 27 Aug 2020 07:12:38 +0000 (+0800)
Subject: jfs: Fix memleak in dbAdjCtl
X-Git-Tag: v5.11-rc1~142^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=751341b4d7841e2b76e78eec382c2e119165497f;p=thirdparty%2Flinux.git

jfs: Fix memleak in dbAdjCtl

When dbBackSplit() fails, mp should be released to
prevent memleak. It's the same when dbJoin() fails.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
---

diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index dc02c7faf01f4..94b7c1cb5ceb3 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -2549,15 +2549,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