2023-01-30 04:43:30

by Dmitry Torokhov

Subject: [PATCH] Input: exc3000 - properly stop timer on shutdown

We need to stop the timer on driver unbind or probe failures, otherwise
we get UAF/Oops.

Fixes: 7e577a17f2ee ("Input: add I2C attached EETI EXC3000 multi touch driver")
Reported-by: "Stahl, Michael" <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/input/touchscreen/exc3000.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c
index 4b7eee01c6aa..69eae79e2087 100644
--- a/drivers/input/touchscreen/exc3000.c
+++ b/drivers/input/touchscreen/exc3000.c
@@ -109,6 +109,11 @@ static inline void exc3000_schedule_timer(struct exc3000_data *data)
mod_timer(&data->timer, jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS));
}

+static void exc3000_shutdown_timer(void *timer)
+{
+ timer_shutdown_sync(timer);
+}
+
static int exc3000_read_frame(struct exc3000_data *data, u8 *buf)
{
struct i2c_client *client = data->client;
@@ -386,6 +391,11 @@ static int exc3000_probe(struct i2c_client *client)
if (error)
return error;

+ error = devm_add_action_or_reset(&client->dev, exc3000_shutdown_timer,
+ &data->timer);
+ if (error)
+ return error;
+
error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, exc3000_interrupt, IRQF_ONESHOT,
client->name, data);
--
2.39.1.456.gfc5497dd1b-goog


--
Dmitry

2023-01-30 06:17:36

by Miko Larsson

Subject: Re: [PATCH] Input: exc3000 - properly stop timer on shutdown

On Sun, 2023-01-29 at 20:43 -0800, Dmitry Torokhov wrote:
> We need to stop the timer on driver unbind or probe failures,
> otherwise
> we get UAF/Oops.
>
> Fixes: 7e577a17f2ee ("Input: add I2C attached EETI EXC3000 multi
> touch driver")
> Reported-by: "Stahl, Michael" <[email protected]>
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
>  drivers/input/touchscreen/exc3000.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/input/touchscreen/exc3000.c
> b/drivers/input/touchscreen/exc3000.c
> index 4b7eee01c6aa..69eae79e2087 100644
> --- a/drivers/input/touchscreen/exc3000.c
> +++ b/drivers/input/touchscreen/exc3000.c
> @@ -109,6 +109,11 @@ static inline void exc3000_schedule_timer(struct
> exc3000_data *data)
>         mod_timer(&data->timer, jiffies +
> msecs_to_jiffies(EXC3000_TIMEOUT_MS));
>  }
>  
> +static void exc3000_shutdown_timer(void *timer)
> +{
> +       timer_shutdown_sync(timer);
> +}
> +
>  static int exc3000_read_frame(struct exc3000_data *data, u8 *buf)
>  {
>         struct i2c_client *client = data->client;
> @@ -386,6 +391,11 @@ static int exc3000_probe(struct i2c_client
> *client)
>         if (error)
>                 return error;
>  
> +       error = devm_add_action_or_reset(&client->dev,
> exc3000_shutdown_timer,
> +                                        &data->timer);
> +       if (error)
> +               return error;
> +
>         error = devm_request_threaded_irq(&client->dev, client->irq,
>                                           NULL, exc3000_interrupt,
> IRQF_ONESHOT,
>                                           client->name, data);
> --
> 2.39.1.456.gfc5497dd1b-goog
>
>

This should probably be Cc'ed to the stable mailing list.
--
~miko