power: max8925: Fix NULL ptr dereference on memory allocation failure
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Tue, 16 Sep 2014 16:10:40 +0000 (18:10 +0200)
committerSebastian Reichel <sre@kernel.org>
Wed, 24 Sep 2014 23:36:42 +0000 (01:36 +0200)
Check the return value of devm_kzalloc() to fix possible NULL pointer
dereference and properly exit the probe() on memory allocation failure.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/max8925_power.c

index b4513f2..0cf2378 100644 (file)
@@ -452,13 +452,14 @@ max8925_power_dt_init(struct platform_device *pdev)
        pdata = devm_kzalloc(&pdev->dev,
                        sizeof(struct max8925_power_pdata),
                        GFP_KERNEL);
+       if (!pdata)
+               goto ret;
 
        of_property_read_u32(np, "topoff-threshold", &topoff_threshold);
        of_property_read_u32(np, "batt-detect", &batt_detect);
        of_property_read_u32(np, "fast-charge", &fast_charge);
        of_property_read_u32(np, "no-insert-detect", &no_insert_detect);
        of_property_read_u32(np, "no-temp-support", &no_temp_support);
-       of_node_put(np);
 
        pdata->batt_detect = batt_detect;
        pdata->fast_charge = fast_charge;
@@ -466,6 +467,8 @@ max8925_power_dt_init(struct platform_device *pdev)
        pdata->no_insert_detect = no_insert_detect;
        pdata->no_temp_support = no_temp_support;
 
+ret:
+       of_node_put(np);
        return pdata;
 }
 #else