redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

md/bitmap: fix memory leak of temporary bitmap 

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>
zero-sugar-mainline-defconfig
Zhao Heming 2020-09-27 13:40:13 +08:00 committed by Song Liu
parent cf0b9b4821
commit 1383b347a8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/md/md-bitmap.c
View File

@ -1950,6 +1950,7 @@ out:
} }
EXPORT_SYMBOL_GPL(md_bitmap_load); 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) struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot)
{ {
int rv = 0; int rv = 0;
@ -2013,6 +2014,7 @@ int md_bitmap_copy_from_slot(struct mddev *mddev, int slot,
md_bitmap_unplug(mddev->bitmap); md_bitmap_unplug(mddev->bitmap);
*low = lo; *low = lo;
*high = hi; *high = hi;
md_bitmap_free(bitmap);
return rv; return rv;
} }
@ -2616,4 +2618,3 @@ struct attribute_group md_bitmap_group = {
.name = "bitmap", .name = "bitmap",
.attrs = md_bitmap_attrs, .attrs = md_bitmap_attrs,
}; };

1
drivers/md/md-cluster.c
View File

@ -1166,6 +1166,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
* can't resize bitmap * can't resize bitmap
*/ */
goto out; goto out;
md_bitmap_free(bitmap);
} }
return 0; return 0;