jfs: Fix memleak in dbAdjCtl
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Thu, 27 Aug 2020 07:12:38 +0000 (15:12 +0800)
committerDave Kleikamp <dave.kleikamp@oracle.com>
Fri, 13 Nov 2020 19:43:02 +0000 (13:43 -0600)
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>
fs/jfs/jfs_dmap.c

index dc02c7f..94b7c1c 100644 (file)
@@ -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