Unverified Commit 6edeb246 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14285 ACPI: battery: Fix possible crash when unregistering a battery hook 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CNNBGD6R2HM3E6NNIFVRUR6JXXUIU3D5/ 
 
https://gitee.com/openeuler/kernel/issues/IBBN6V 
 
Link:https://gitee.com/openeuler/kernel/pulls/14285

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 3fef6881 df5c582f

drivers/acpi/battery.c

+9 −3
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook) 
	list_for_each_entry(battery, &acpi_battery_list, list) {

		hook->remove_battery(battery->bat);

	}

	list_del(&hook->list);

	list_del_init(&hook->list);



	pr_info("extension unregistered: %s\n", hook->name);

}
@@ -702,7 +702,14 @@ static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook) 
void battery_hook_unregister(struct acpi_battery_hook *hook)

{

	mutex_lock(&hook_mutex);

	/*

	 * Ignore already unregistered battery hooks. This might happen

	 * if a battery hook was previously unloaded due to an error when

	 * adding a new battery.

	 */

	if (!list_empty(&hook->list))

		battery_hook_unregister_unlocked(hook);



	mutex_unlock(&hook_mutex);

}

EXPORT_SYMBOL_GPL(battery_hook_unregister);
@@ -712,7 +719,6 @@ void battery_hook_register(struct acpi_battery_hook *hook) 
	struct acpi_battery *battery;



	mutex_lock(&hook_mutex);

	INIT_LIST_HEAD(&hook->list);

	list_add(&hook->list, &battery_hook_list);

	/*

	 * Now that the driver is registered, we need