* [PATCH] max17042_battery: fix potential use-after-free on device remove
@ 2019-02-15 22:03 Sven Van Asbroeck
2019-02-15 22:08 ` Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: Sven Van Asbroeck @ 2019-02-15 22:03 UTC (permalink / raw)
To: Sebastian Reichel; +Cc: linux-pm, linux-kernel, Hans de Goede
The work which is scheduled on a POR boot is potentially left
pending or running until after the device module is removed,
which could result in a use-after-free.
Fix by registering a cancel/sync callback, which gets executed as
part of standard resource unwinding.
This issue was detected with the help of Coccinelle.
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
---
drivers/power/supply/max17042_battery.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index 2a8d75e5e930..581c6bd23388 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -995,6 +995,13 @@ static const struct power_supply_desc max17042_no_current_sense_psy_desc = {
.num_properties = ARRAY_SIZE(max17042_battery_props) - 2,
};
+static void max17042_stop_work(void *data)
+{
+ struct max17042_chip *chip = data;
+
+ cancel_work_sync(&chip->work);
+}
+
static int max17042_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -1101,6 +1108,9 @@ static int max17042_probe(struct i2c_client *client,
regmap_read(chip->regmap, MAX17042_STATUS, &val);
if (val & STATUS_POR_BIT) {
INIT_WORK(&chip->work, max17042_init_worker);
+ ret = devm_add_action(&client->dev, max17042_stop_work, chip);
+ if (ret)
+ return ret;
schedule_work(&chip->work);
} else {
chip->init_complete = 1;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] max17042_battery: fix potential use-after-free on device remove
2019-02-15 22:03 [PATCH] max17042_battery: fix potential use-after-free on device remove Sven Van Asbroeck
@ 2019-02-15 22:08 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2019-02-15 22:08 UTC (permalink / raw)
To: Sven Van Asbroeck, Sebastian Reichel; +Cc: linux-pm, linux-kernel
Hi,
On 2/15/19 11:03 PM, Sven Van Asbroeck wrote:
> The work which is scheduled on a POR boot is potentially left
> pending or running until after the device module is removed,
> which could result in a use-after-free.
>
> Fix by registering a cancel/sync callback, which gets executed as
> part of standard resource unwinding.
>
> This issue was detected with the help of Coccinelle.
>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
Looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/power/supply/max17042_battery.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
> index 2a8d75e5e930..581c6bd23388 100644
> --- a/drivers/power/supply/max17042_battery.c
> +++ b/drivers/power/supply/max17042_battery.c
> @@ -995,6 +995,13 @@ static const struct power_supply_desc max17042_no_current_sense_psy_desc = {
> .num_properties = ARRAY_SIZE(max17042_battery_props) - 2,
> };
>
> +static void max17042_stop_work(void *data)
> +{
> + struct max17042_chip *chip = data;
> +
> + cancel_work_sync(&chip->work);
> +}
> +
> static int max17042_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -1101,6 +1108,9 @@ static int max17042_probe(struct i2c_client *client,
> regmap_read(chip->regmap, MAX17042_STATUS, &val);
> if (val & STATUS_POR_BIT) {
> INIT_WORK(&chip->work, max17042_init_worker);
> + ret = devm_add_action(&client->dev, max17042_stop_work, chip);
> + if (ret)
> + return ret;
> schedule_work(&chip->work);
> } else {
> chip->init_complete = 1;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-15 22:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-15 22:03 [PATCH] max17042_battery: fix potential use-after-free on device remove Sven Van Asbroeck
2019-02-15 22:08 ` Hans de Goede
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).