]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: supply: ab8500: fix leaked of_node refs in ab8500_bm_of_probe
authorWen Yang <wen.yang99@zte.com.cn>
Wed, 17 Apr 2019 02:43:02 +0000 (10:43 +0800)
committerSebastian Reichel <sre@kernel.org>
Wed, 17 Apr 2019 20:14:24 +0000 (22:14 +0200)
The call to of_parse_phandle returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.

492 int ab8500_bm_of_probe(struct device *dev,
493                        struct device_node *np,
494                        struct abx500_bm_data *bm)
495 {
496         const struct batres_vs_temp *tmp_batres_tbl;
497         struct device_node *battery_node;
    ...
501         /* get phandle to 'battery-info' node */
502         battery_node = of_parse_phandle(np, "battery", 0);
    ...
509         if (!btech) {
510                 dev_warn(dev, "missing property battery-name/type\n");
511                 return -EINVAL;    ---> leaked here
512         }
    ...
540         of_node_put(battery_node);   ---> released here
541
542         return 0;
543 }

Detected by coccinelle with the following warnings:
./drivers/power/supply/ab8500_bmdata.c:511:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 502, but without a corresponding object release within this function.

Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/ab8500_bmdata.c

index 7b2b69916f48c7004b5545c07dd015952babd679..f6a66979cbb5238882a7dc7b41eb8d93383b9c97 100644 (file)
@@ -508,6 +508,7 @@ int ab8500_bm_of_probe(struct device *dev,
        btech = of_get_property(battery_node, "stericsson,battery-type", NULL);
        if (!btech) {
                dev_warn(dev, "missing property battery-name/type\n");
+               of_node_put(battery_node);
                return -EINVAL;
        }