mtd: Replace kcalloc() with devm_kcalloc()

commit 1b61a59876f0eafc19b23007c522ee407f55dbec upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/mtdpstore.c b/drivers/mtd/mtdpstore.c
index b3e2ea4dd40ed81d2c413e88076b22ff59e6da7d..9cf3872e37ae1472419124f945a6acc6278f836d 100644 (file)
--- a/drivers/mtd/mtdpstore.c
+++ b/drivers/mtd/mtdpstore.c
@@ -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);
 
        if (!cxt->rmmap || !cxt->usedmap || !cxt->badmap)
                return;
@@ -530,9 +530,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;
 }