From: Hanjun Guo <guohanjun@huawei.com>
Date: Wed, 2 Jun 2021 09:36:50 +0000 (+0800)
Subject: ACPI: bus: Call kobject_put() in acpi_init() error path
X-Git-Tag: v5.4.132~227
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2238732f19926fc49e9d3e00e09da0e91da5e428;p=users%2Fdwmw2%2Flinux.git

ACPI: bus: Call kobject_put() in acpi_init() error path

[ 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>
---

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 54002670cb7a1..bbd9c93fc4c26 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1240,6 +1240,7 @@ static int __init acpi_init(void)
 
 	result = acpi_bus_init();
 	if (result) {
+		kobject_put(acpi_kobj);
 		disable_acpi();
 		return result;
 	}