summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorSven Van Asbroeck <thesven73@gmail.com>2019-09-19 11:11:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-11 04:34:02 -0800
commitd12fbc55c1e9d293cdb73695377b7cd6421ca7d6 (patch)
treef21b97a3e2120fd97efb0b88c6c4d32ce6dfc122 /drivers/power
parenta6b40467ea75bc374f6c4a3e202bbb3dbb1ae651 (diff)
downloadlinux-rt-d12fbc55c1e9d293cdb73695377b7cd6421ca7d6.tar.gz
power: supply: ltc2941-battery-gauge: fix use-after-free
commit a60ec78d306c6548d4adbc7918b587a723c555cc upstream. 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. Cc: stable <stable@vger.kernel.org> Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/ltc2941-battery-gauge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/ltc2941-battery-gauge.c b/drivers/power/supply/ltc2941-battery-gauge.c
index 4f129bb4c972..ff5febea1a21 100644
--- a/drivers/power/supply/ltc2941-battery-gauge.c
+++ b/drivers/power/supply/ltc2941-battery-gauge.c
@@ -448,7 +448,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;
}