mtd: Replace kcalloc() with devm_kcalloc()
authorJiasheng Jiang <jiashengjiangcool@gmail.com>
Wed, 5 Feb 2025 02:31:40 +0000 (02:31 +0000)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 4 Mar 2025 11:07:08 +0000 (12:07 +0100)
Replace kcalloc() with devm_kcalloc() to prevent memory leaks in case of
errors.

Fixes: 78c08247b9d3 ("mtd: Support kmsg dumper based on pstore/blk")
Cc: stable@vger.kernel.org # v5.10+
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/mtdpstore.c

index 7ac8ac90130685c9fdd7b4d166dee51dbe3d695e..2d004d41cf751a456026776517c5a213937a47a6 100644 (file)
@@ -417,11 +417,11 @@ static void mtdpstore_notify_add(struct mtd_info *mtd)
        }
 
        longcnt = BITS_TO_LONGS(div_u64(mtd->size, info->kmsg_size));
-       cxt->rmmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL);
-       cxt->usedmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL);
+       cxt->rmmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL);
+       cxt->usedmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL);
 
        longcnt = BITS_TO_LONGS(div_u64(mtd->size, mtd->erasesize));
-       cxt->badmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL);
+       cxt->badmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL);
 
        /* just support dmesg right now */
        cxt->dev.flags = PSTORE_FLAGS_DMESG;
@@ -527,9 +527,6 @@ static void mtdpstore_notify_remove(struct mtd_info *mtd)
        mtdpstore_flush_removed(cxt);
 
        unregister_pstore_device(&cxt->dev);
-       kfree(cxt->badmap);
-       kfree(cxt->usedmap);
-       kfree(cxt->rmmap);
        cxt->mtd = NULL;
        cxt->index = -1;
 }