Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ad07d4 authored by Dan Carpenter's avatar Dan Carpenter Committed by Brian Norris
Browse files

mtd: pmcmsp-flash: Allocating too much in init_msp_flash() 



There is a cut and paste issue here.  The bug is that we are allocating
more memory than necessary for msp_maps.  We should be allocating enough
space for a map_info struct (144 bytes) but we instead allocate enough
for an mtd_info struct (1840 bytes).  It's a small waste.

The other part of this is not harmful but when we allocated msp_flash
then we allocated enough space fro a map_info pointer instead of an
mtd_info pointer.  But since pointers are the same size it works out
fine.

Anyway, I decided to clean up all three allocations a bit to make them
a bit more consistent and clear.

Fixes: 68aa0fa8 ('[MTD] PMC MSP71xx flash/rootfs mappings')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent dc01a28d

drivers/mtd/maps/pmcmsp-flash.c

+3 −3
Original line number Diff line number Diff line
@@ -75,15 +75,15 @@ static int __init init_msp_flash(void) 


	printk(KERN_NOTICE "Found %d PMC flash devices\n", fcnt);



	msp_flash = kmalloc(fcnt * sizeof(struct map_info *), GFP_KERNEL);

	msp_flash = kcalloc(fcnt, sizeof(*msp_flash), GFP_KERNEL);

	if (!msp_flash)

		return -ENOMEM;



	msp_parts = kmalloc(fcnt * sizeof(struct mtd_partition *), GFP_KERNEL);

	msp_parts = kcalloc(fcnt, sizeof(*msp_parts), GFP_KERNEL);

	if (!msp_parts)

		goto free_msp_flash;



	msp_maps = kcalloc(fcnt, sizeof(struct mtd_info), GFP_KERNEL);

	msp_maps = kcalloc(fcnt, sizeof(*msp_maps), GFP_KERNEL);

	if (!msp_maps)

		goto free_msp_parts;