|
Roy Hopkins |
8e7b0e |
From: Zheng Wang <zyytlz.wz@163.com>
|
|
Roy Hopkins |
8e7b0e |
Date: Fri, 10 Mar 2023 16:40:07 +0800
|
|
Roy Hopkins |
8e7b0e |
Subject: hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to
|
|
Roy Hopkins |
8e7b0e |
race condition
|
|
Roy Hopkins |
8e7b0e |
Git-commit: cb090e64cf25602b9adaf32d5dfc9c8bec493cd1
|
|
Roy Hopkins |
8e7b0e |
Patch-mainline: v6.3-rc3
|
|
Roy Hopkins |
8e7b0e |
References: CVE-2023-1855 bsc#1210202
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
In xgene_hwmon_probe, &ctx->workq is bound with xgene_hwmon_evt_work.
|
|
Roy Hopkins |
8e7b0e |
Then it will be started.
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
If we remove the driver which will call xgene_hwmon_remove to clean up,
|
|
Roy Hopkins |
8e7b0e |
there may be unfinished work.
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
The possible sequence is as follows:
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
Fix it by finishing the work before cleanup in xgene_hwmon_remove.
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
CPU0 CPU1
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
|xgene_hwmon_evt_work
|
|
Roy Hopkins |
8e7b0e |
xgene_hwmon_remove |
|
|
Roy Hopkins |
8e7b0e |
kfifo_free(&ctx->async_msg_fifo);|
|
|
Roy Hopkins |
8e7b0e |
|
|
|
Roy Hopkins |
8e7b0e |
|kfifo_out_spinlocked
|
|
Roy Hopkins |
8e7b0e |
|//use &ctx->async_msg_fifo
|
|
Roy Hopkins |
8e7b0e |
Fixes: 2ca492e22cb7 ("hwmon: (xgene) Fix crash when alarm occurs before driver probe")
|
|
Roy Hopkins |
8e7b0e |
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
|
|
Roy Hopkins |
8e7b0e |
Link: https://lore.kernel.org/r/20230310084007.1403388-1-zyytlz.wz@163.com
|
|
Roy Hopkins |
8e7b0e |
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Roy Hopkins |
8e7b0e |
Acked-by: Roy Hopkins <roy.hopkins@suse.com>
|
|
Roy Hopkins |
8e7b0e |
---
|
|
Roy Hopkins |
8e7b0e |
drivers/hwmon/xgene-hwmon.c | 1 +
|
|
Roy Hopkins |
8e7b0e |
1 file changed, 1 insertion(+)
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c
|
|
Roy Hopkins |
8e7b0e |
index 5cde837bfd09..d1abea49f01b 100644
|
|
Roy Hopkins |
8e7b0e |
--- a/drivers/hwmon/xgene-hwmon.c
|
|
Roy Hopkins |
8e7b0e |
+++ b/drivers/hwmon/xgene-hwmon.c
|
|
Roy Hopkins |
8e7b0e |
@@ -761,6 +761,7 @@ static int xgene_hwmon_remove(struct platform_device *pdev)
|
|
Roy Hopkins |
8e7b0e |
{
|
|
Roy Hopkins |
8e7b0e |
struct xgene_hwmon_dev *ctx = platform_get_drvdata(pdev);
|
|
Roy Hopkins |
8e7b0e |
|
|
Roy Hopkins |
8e7b0e |
+ cancel_work_sync(&ctx->workq);
|
|
Roy Hopkins |
8e7b0e |
hwmon_device_unregister(ctx->hwmon_dev);
|
|
Roy Hopkins |
8e7b0e |
kfifo_free(&ctx->async_msg_fifo);
|
|
Roy Hopkins |
8e7b0e |
if (acpi_disabled)
|
|
Roy Hopkins |
8e7b0e |
|