lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 641/757] md/bitmap: fix memory leak of temporary bitmap
    Date
    From: Zhao Heming <heming.zhao@suse.com>

    [ 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>
    ---
    drivers/md/md-bitmap.c | 3 ++-
    drivers/md/md-cluster.c | 1 +
    2 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
    index b10c51988c8ee..c61ab86a28b52 100644
    --- a/drivers/md/md-bitmap.c
    +++ b/drivers/md/md-bitmap.c
    @@ -1949,6 +1949,7 @@ int md_bitmap_load(struct mddev *mddev)
    }
    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 d50737ec40394..afbbc552c3275 100644
    --- 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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:40    [W:6.055 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site