md/bitmap: fix memory leak of temporary bitmap

[ Upstream commit 1383b347a8ae4a69c04ae3746e6cb5c8d38e2585 ]

Callers of get_bitmap_from_slot() are responsible to free the bitmap.

Suggested-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Zhao Heming <heming.zhao@suse.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 95a5f3757fa30854ab46227a1bc92b413dfd8e10..19b2601be3c5e974809a4bb2a0cb696d44101a2d 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1949,6 +1949,7 @@ out:
 }
 EXPORT_SYMBOL_GPL(md_bitmap_load);
 
+/* caller need to free returned bitmap with md_bitmap_free() */
 struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot)
 {
        int rv = 0;
@@ -2012,6 +2013,7 @@ int md_bitmap_copy_from_slot(struct mddev *mddev, int slot,
        md_bitmap_unplug(mddev->bitmap);
        *low = lo;
        *high = hi;
+       md_bitmap_free(bitmap);
 
        return rv;
 }
@@ -2615,4 +2617,3 @@ struct attribute_group md_bitmap_group = {
        .name = "bitmap",
        .attrs = md_bitmap_attrs,
 };
-

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index d50737ec4039461476468adbcc6db380d6de921f..afbbc552c3275cddd278ac456e6573d2906c612f 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1166,6 +1166,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
                         * can't resize bitmap
                         */
                        goto out;
+               md_bitmap_free(bitmap);
        }
 
        return 0;