Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: Replace kcalloc() with devm_kcalloc()

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>

authored by

Jiasheng Jiang and committed by
Miquel Raynal
1b61a598 9ea13d9e

+3 -6
+3 -6
drivers/mtd/mtdpstore.c
··· 417 417 } 418 418 419 419 longcnt = BITS_TO_LONGS(div_u64(mtd->size, info->kmsg_size)); 420 - cxt->rmmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL); 421 - cxt->usedmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL); 420 + cxt->rmmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL); 421 + cxt->usedmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL); 422 422 423 423 longcnt = BITS_TO_LONGS(div_u64(mtd->size, mtd->erasesize)); 424 - cxt->badmap = kcalloc(longcnt, sizeof(long), GFP_KERNEL); 424 + cxt->badmap = devm_kcalloc(&mtd->dev, longcnt, sizeof(long), GFP_KERNEL); 425 425 426 426 /* just support dmesg right now */ 427 427 cxt->dev.flags = PSTORE_FLAGS_DMESG; ··· 527 527 mtdpstore_flush_removed(cxt); 528 528 529 529 unregister_pstore_device(&cxt->dev); 530 - kfree(cxt->badmap); 531 - kfree(cxt->usedmap); 532 - kfree(cxt->rmmap); 533 530 cxt->mtd = NULL; 534 531 cxt->index = -1; 535 532 }