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

Commit 7e0c19c9 authored by Colin Ian King's avatar Colin Ian King Committed by Brian Norris
Browse files

mtd: physmap_of: fix null pointer deference when kzalloc returns null 



static analysis by smatch caught the following error:

drivers/mtd/maps/physmap_of.c:135 of_get_probes()
   error: potential null dereference 'res'.  (kzalloc returns null)

Check for failed kzalloc and return -ENOMEM in of_flash_probe if
this occurs.

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 11c7e0e2

drivers/mtd/maps/physmap_of.c

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ static const char * const *of_get_probes(struct device_node *dp) 
			count++;



	res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL);

	if (!res)

		return NULL;

	count = 0;

	while (cplen > 0) {

		res[count] = cp;
@@ -311,6 +313,10 @@ static int of_flash_probe(struct platform_device *dev) 


	ppdata.of_node = dp;

	part_probe_types = of_get_probes(dp);

	if (!part_probe_types) {

		err = -ENOMEM;

		goto err_out;

	}

	mtd_device_parse_register(info->cmtd, part_probe_types, &ppdata,

			NULL, 0);

	of_free_probes(part_probe_types);