Commit 104bb8a6 authored by ruanjinjie's avatar ruanjinjie Committed by Sebastian Reichel
Browse files

power: supply: fix null pointer dereferencing in power_supply_get_battery_info 



when kmalloc() fail to allocate memory in kasprintf(), propname
will be NULL, strcmp() called by of_get_property() will cause
null pointer dereference.

So return ENOMEM if kasprintf() return NULL pointer.

Fixes: 3afb50d7 ("power: supply: core: Add some helpers to use the battery OCV capacity table")
Signed-off-by: default avatarruanjinjie <ruanjinjie@huawei.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 7e6fb678

drivers/power/supply/power_supply_core.c

+5 −0
Original line number Diff line number Diff line
@@ -750,6 +750,11 @@ int power_supply_get_battery_info(struct power_supply *psy, 
		int i, tab_len, size;



		propname = kasprintf(GFP_KERNEL, "ocv-capacity-table-%d", index);

		if (!propname) {

			power_supply_put_battery_info(psy, info);

			err = -ENOMEM;

			goto out_put_node;

		}

		list = of_get_property(battery_np, propname, &size);

		if (!list || !size) {

			dev_err(&psy->dev, "failed to get %s\n", propname);