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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=7e0c19c9608483808e6b5c294e357fa456f058e1
Commit:     7e0c19c9608483808e6b5c294e357fa456f058e1
Parent:     11c7e0e2f91fdfdf9f7b4d107bc93d6c298c95fe
Author:     Colin Ian King <colin.king at canonical.com>
AuthorDate: Fri Jul 17 11:37:52 2015 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Aug 18 17:57:19 2015 -0700

    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: Colin Ian King <colin.king at canonical.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/physmap_of.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 774b32f..3e614e9 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -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);