]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
power-supply: Don't over-allocate memory for "supplied-from" array
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 4 Sep 2014 12:01:22 +0000 (17:31 +0530)
committerSebastian Reichel <sre@kernel.org>
Tue, 16 Sep 2014 09:01:26 +0000 (11:01 +0200)
In routine power_supply_check_supplies(), 'cnt' is counting the number of
supplies passed in "power-supplies" field of a node. The value of 'cnt' will
always be one more than the number of supplies after the do-while loop ends. And
so we need to allocate memory for 'cnt - 1' char pointers. But we are allocating
memory for 'cnt' instead.

Fix this by not over-allocating memory.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/power_supply_core.c

index 078afd61490d15cfeb9dd29517785430a634ec28..10f0b57f00d90abf7447dea6e6dfb533340c0b57 100644 (file)
@@ -234,7 +234,7 @@ static int power_supply_check_supplies(struct power_supply *psy)
                return -ENOMEM;
        }
 
-       *psy->supplied_from = devm_kzalloc(psy->dev, sizeof(char *) * cnt,
+       *psy->supplied_from = devm_kzalloc(psy->dev, sizeof(char *) * (cnt - 1),
                                           GFP_KERNEL);
        if (!*psy->supplied_from) {
                dev_err(psy->dev, "Couldn't allocate memory for supply list\n");