]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
power: supply: ltc2941-battery-gauge: fix use-after-free
authorSven Van Asbroeck <thesven73@gmail.com>
Thu, 19 Sep 2019 15:11:37 +0000 (11:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Feb 2020 12:36:55 +0000 (04:36 -0800)
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>
drivers/power/supply/ltc2941-battery-gauge.c

index da49436176cd9e4fc9dd8abe5419803396333c7d..30a9014b2f95e39be569588a2fdad3ce27eb8ea6 100644 (file)
@@ -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;
 }