| From 7a47ed77fe955909c464f656e943841bda71fd94 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 2 Jun 2021 17:36:50 +0800 |
| Subject: ACPI: bus: Call kobject_put() in acpi_init() error path |
| |
| From: Hanjun Guo <guohanjun@huawei.com> |
| |
| [ Upstream commit 4ac7a817f1992103d4e68e9837304f860b5e7300 ] |
| |
| Although the system will not be in a good condition or it will not |
| boot if acpi_bus_init() fails, it is still necessary to put the |
| kobject in the error path before returning to avoid leaking memory. |
| |
| Signed-off-by: Hanjun Guo <guohanjun@huawei.com> |
| [ rjw: Subject and changelog edits ] |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/acpi/bus.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c |
| index d60e57d14c85..d9dc9d2f38d5 100644 |
| --- a/drivers/acpi/bus.c |
| +++ b/drivers/acpi/bus.c |
| @@ -1240,6 +1240,7 @@ static int __init acpi_init(void) |
| init_acpi_device_notify(); |
| result = acpi_bus_init(); |
| if (result) { |
| + kobject_put(acpi_kobj); |
| disable_acpi(); |
| return result; |
| } |
| -- |
| 2.30.2 |
| |
