* [PATCH] power: supply: fix null pointer dereferencing in power_supply_get_battery_info
@ 2022-12-04 2:38 ruanjinjie
2022-12-05 7:12 ` Baolin Wang
0 siblings, 1 reply; 2+ messages in thread
From: ruanjinjie @ 2022-12-04 2:38 UTC (permalink / raw)
To: sre, linus.walleij, baolin.wang, linux-pm, linux-kernel; +Cc: ruanjinjie
when kmalloc() fail to allocate memory in kasprintf(), propname
will be NULL, strcmp() called by of_get_property() will cause
null pointer dereference.
So directly return ENOMEM, if kasprintf() return NULL pointer.
Fixes: 3afb50d7125b ("power: supply: core: Add some helpers to use the battery OCV capacity table")
Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
---
drivers/power/supply/power_supply_core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 4b5fb172fa99..2fd6ab7a4471 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -750,6 +750,8 @@ 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)
+ return -ENOMEM;
list = of_get_property(battery_np, propname, &size);
if (!list || !size) {
dev_err(&psy->dev, "failed to get %s\n", propname);
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] power: supply: fix null pointer dereferencing in power_supply_get_battery_info
2022-12-04 2:38 [PATCH] power: supply: fix null pointer dereferencing in power_supply_get_battery_info ruanjinjie
@ 2022-12-05 7:12 ` Baolin Wang
0 siblings, 0 replies; 2+ messages in thread
From: Baolin Wang @ 2022-12-05 7:12 UTC (permalink / raw)
To: ruanjinjie, sre, linus.walleij, linux-pm, linux-kernel
Hi,
On 12/4/2022 10:38 AM, ruanjinjie wrote:
> when kmalloc() fail to allocate memory in kasprintf(), propname
> will be NULL, strcmp() called by of_get_property() will cause
> null pointer dereference.
>
> So directly return ENOMEM, if kasprintf() return NULL pointer.
>
> Fixes: 3afb50d7125b ("power: supply: core: Add some helpers to use the battery OCV capacity table")
> Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
> ---
> drivers/power/supply/power_supply_core.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 4b5fb172fa99..2fd6ab7a4471 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -750,6 +750,8 @@ 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)
> + return -ENOMEM;
Please read the code carefully, you can not just return error number
without releasing resource.
> list = of_get_property(battery_np, propname, &size);
> if (!list || !size) {
> dev_err(&psy->dev, "failed to get %s\n", propname);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-05 7:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-04 2:38 [PATCH] power: supply: fix null pointer dereferencing in power_supply_get_battery_info ruanjinjie
2022-12-05 7:12 ` Baolin Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®