Skip to contentSkip to conversation

power: supply: ltc2941-battery-gauge: fix use-after-free

PATCH In review Sven Van Asbroeck 3 participants 7 messages Sep 19, 2019 – Feb 7, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 power: supply: ltc2941-battery-gauge: fix use-after-free

This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This could mean that the work function is still running after the driver's remove function has finished, which would result in a use-after-free.

Fix by calling cancel_delayed_work_sync(), which ensures that that the work is properly cancelled, no longer running, and unable to re-schedule itself.

This issue was detected with the help of Coccinelle.

---
 drivers/power/supply/ltc2941-battery-gauge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/ltc2941-battery-gauge.c +1 -1
index da49436176cd..30a9014b2f95 100644
@@ -449,7 +449,7 @@ static int ltc294x_i2c_remove(struct i2c_client *client)
 {
 	struct ltc294x_info *info = i2c_get_clientdata(client);
 
-	cancel_delayed_work(&info->work);
+	cancel_delayed_work_sync(&info->work);
 	power_supply_unregister(info->supply);
 	return 0;
 }
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 18 lines · Sasha Levin

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.2.15, v4.19.73, v4.14.144, v4.9.193, v4.4.193.

v5.2.15: Build OK!
v4.19.73: Build OK!
v4.14.144: Build OK!
v4.9.193: Build OK!
v4.4.193: Failed to apply! Possible dependencies:
Unable to calculate

Quoted 7 lines

NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

--
Thanks,
Sasha

Doesn't apply on 4.4 because power supply drivers moved to a different directory (power/supply) between 4.4 and 4.9.

I will post a patch with a fixed-up file path, marked as "[PATCH 4.4 v1]". If this should be addressed differently, please let me know.

Sven

#3 lore raw

PATCH 1/1 power: supply: ltc2941-battery-gauge: fix use-after-free

In reply to Sven Van Asbroeck

This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This could mean that the work function is still running after the driver's remove function has finished, which would result in a use-after-free.

Fix by calling cancel_delayed_work_sync(), which ensures that that the work is properly cancelled, no longer running, and unable to re-schedule itself.

This issue was detected with the help of Coccinelle.

---
 drivers/power/ltc2941-battery-gauge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/ltc2941-battery-gauge.c +1 -1
index da49436176cd..30a9014b2f95 100644
@@ -449,7 +449,7 @@ static int ltc294x_i2c_remove(struct i2c_client *client)
 {
 	struct ltc294x_info *info = i2c_get_clientdata(client);
 
-	cancel_delayed_work(&info->work);
+	cancel_delayed_work_sync(&info->work);
 	power_supply_unregister(info->supply);
 	return 0;
 }
Signature · 1 line
2.17.1
#4 lore raw
Quoted 34 lines · Sven Van Asbroeck

This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This could mean that the work function is still running after the driver's remove function has finished, which would result in a use-after-free.

Fix by calling cancel_delayed_work_sync(), which ensures that that the work is properly cancelled, no longer running, and unable to re-schedule itself.

This issue was detected with the help of Coccinelle.

---
 drivers/power/ltc2941-battery-gauge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/ltc2941-battery-gauge.c +1 -1
index da49436176cd..30a9014b2f95 100644
@@ -449,7 +449,7 @@ static int ltc294x_i2c_remove(struct i2c_client *client)
 {
 	struct ltc294x_info *info = i2c_get_clientdata(client);
 
-	cancel_delayed_work(&info->work);
+	cancel_delayed_work_sync(&info->work);
 	power_supply_unregister(info->supply);
 	return 0;
 }
Signature · 1 line
2.17.1

What is the git commit id of this patch in Linus's tree?

thanks,

greg k-h

#7 lore raw
In reply to Sven Van Asbroeck

Hi,

Quoted 10 lines · Sven Van Asbroeck

This driver's remove path calls cancel_delayed_work(). However, that function does not wait until the work function finishes. This could mean that the work function is still running after the driver's remove function has finished, which would result in a use-after-free.

Fix by calling cancel_delayed_work_sync(), which ensures that that the work is properly cancelled, no longer running, and unable to re-schedule itself.

Quoted 5 lines

This issue was detected with the help of Coccinelle.

---

Thanks, queued.

-- Sebastian

Quoted 19 lines
 drivers/power/supply/ltc2941-battery-gauge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/ltc2941-battery-gauge.c +1 -1
index da49436176cd..30a9014b2f95 100644
@@ -449,7 +449,7 @@ static int ltc294x_i2c_remove(struct i2c_client *client)
 {
 	struct ltc294x_info *info = i2c_get_clientdata(client);
 
-	cancel_delayed_work(&info->work);
+	cancel_delayed_work_sync(&info->work);
 	power_supply_unregister(info->supply);
 	return 0;
 }
Signature · 1 line
2.17.1