diff options
| author | Colin Ian King <colin.king@canonical.com> | 2015-07-17 12:37:52 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-08-19 02:57:19 +0200 |
| commit | 7e0c19c9608483808e6b5c294e357fa456f058e1 (patch) | |
| tree | bef1c0a26bcb32b9dd18f2432d8f07e53ec4776b /drivers/mtd | |
| parent | mtd: nettel: do not ignore mtd_device_register() failure in nettel_init() (diff) | |
| download | linux-7e0c19c9608483808e6b5c294e357fa456f058e1.tar.xz linux-7e0c19c9608483808e6b5c294e357fa456f058e1.zip | |
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@canonical.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/physmap_of.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 774b32fd29e6..3e614e9119d5 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); |