|
Takashi Iwai |
a67542 |
From 06615d11cc78162dfd5116efb71f29eb29502d37 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
a67542 |
From: Zheng Wang <zyytlz.wz@163.com>
|
|
Takashi Iwai |
a67542 |
Date: Sun, 12 Mar 2023 01:46:50 +0800
|
|
Takashi Iwai |
a67542 |
Subject: [PATCH] power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition
|
|
Takashi Iwai |
a67542 |
Git-commit: 06615d11cc78162dfd5116efb71f29eb29502d37
|
|
Takashi Iwai |
a67542 |
Patch-mainline: v6.3-rc4
|
|
Takashi Iwai |
a67542 |
References: CVE-2023-30772 bsc#1210329
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
In da9150_charger_probe, &charger->otg_work is bound with
|
|
Takashi Iwai |
a67542 |
da9150_charger_otg_work. da9150_charger_otg_ncb may be
|
|
Takashi Iwai |
a67542 |
called to start the work.
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
If we remove the module which will call da9150_charger_remove
|
|
Takashi Iwai |
a67542 |
to make cleanup, there may be a unfinished work. The possible
|
|
Takashi Iwai |
a67542 |
sequence is as follows:
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
Fix it by canceling the work before cleanup in the da9150_charger_remove
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
CPU0 CPUc1
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
|da9150_charger_otg_work
|
|
Takashi Iwai |
a67542 |
da9150_charger_remove |
|
|
Takashi Iwai |
a67542 |
power_supply_unregister |
|
|
Takashi Iwai |
a67542 |
device_unregister |
|
|
Takashi Iwai |
a67542 |
power_supply_dev_release|
|
|
Takashi Iwai |
a67542 |
kfree(psy) |
|
|
Takashi Iwai |
a67542 |
|
|
|
Takashi Iwai |
a67542 |
| power_supply_changed(charger->usb);
|
|
Takashi Iwai |
a67542 |
| //use
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
Fixes: c1a281e34dae ("power: Add support for DA9150 Charger")
|
|
Takashi Iwai |
a67542 |
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
|
|
Takashi Iwai |
a67542 |
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Takashi Iwai |
a67542 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
---
|
|
Takashi Iwai |
a67542 |
drivers/power/supply/da9150-charger.c | 1 +
|
|
Takashi Iwai |
a67542 |
1 file changed, 1 insertion(+)
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
diff --git a/drivers/power/supply/da9150-charger.c b/drivers/power/supply/da9150-charger.c
|
|
Takashi Iwai |
a67542 |
index 14da5c595dd9..a87aeaea38e1 100644
|
|
Takashi Iwai |
a67542 |
--- a/drivers/power/supply/da9150-charger.c
|
|
Takashi Iwai |
a67542 |
+++ b/drivers/power/supply/da9150-charger.c
|
|
Takashi Iwai |
a67542 |
@@ -657,6 +657,7 @@ static int da9150_charger_remove(struct platform_device *pdev)
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
if (!IS_ERR_OR_NULL(charger->usb_phy))
|
|
Takashi Iwai |
a67542 |
usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);
|
|
Takashi Iwai |
a67542 |
+ cancel_work_sync(&charger->otg_work);
|
|
Takashi Iwai |
a67542 |
|
|
Takashi Iwai |
a67542 |
power_supply_unregister(charger->battery);
|
|
Takashi Iwai |
a67542 |
power_supply_unregister(charger->usb);
|
|
Takashi Iwai |
a67542 |
--
|
|
Takashi Iwai |
a67542 |
2.35.3
|
|
Takashi Iwai |
a67542 |
|