[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAF8JNhKjXH+zD6-b=ym+Y8SPwPEUdUu+r8k25FBefYg+aEi6JQ@mail.gmail.com>
Date: Tue, 10 Jun 2025 15:21:45 -0700
From: Ping Cheng <pinglinux@...il.com>
To: Jiri Kosina <jikos@...nel.org>, stable@...nel.org
Cc: Thomas Zeitlhofer <thomas.zeitlhofer+lkml@...it.at>,
Jason Gerecke <jason.gerecke@...om.com>, Benjamin Tissoires <bentiss@...nel.org>,
Josh Dickens <joshua.dickens@...om.com>, Tatsunosuke Tobita <tatsunosuke.wacom@...il.com>,
Aaron Skomra <aaron.skomra@...om.com>, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] HID: wacom: fix crash in wacom_aes_battery_handler()
On Tue, Jun 10, 2025 at 12:21 PM Jiri Kosina <jikos@...nel.org> wrote:
>
> On Mon, 19 May 2025, Thomas Zeitlhofer wrote:
>
> > Commit fd2a9b29dc9c ("HID: wacom: Remove AES power_supply after extended
> > inactivity") introduced wacom_aes_battery_handler() which is scheduled
> > as a delayed work (aes_battery_work).
> >
> > In wacom_remove(), aes_battery_work is not canceled. Consequently, if
> > the device is removed while aes_battery_work is still pending, then hard
> > crashes or "Oops: general protection fault..." are experienced when
> > wacom_aes_battery_handler() is finally called. E.g., this happens with
> > built-in USB devices after resume from hibernate when aes_battery_work
> > was still pending at the time of hibernation.
> >
> > So, take care to cancel aes_battery_work in wacom_remove().
> >
> > Fixes: fd2a9b29dc9c ("HID: wacom: Remove AES power_supply after extended inactivity")
> > Signed-off-by: Thomas Zeitlhofer <thomas.zeitlhofer+lkml@...it.at>
Acked-by: Ping Cheng <ping.cheng@...om.com>
Thank you, Thomas, for the patch. Your support is greatly appreciated!
> This looks good to me, and I am planning to push it to Linus through
> for-6.16/upstream-fixes.
>
> Jason, Ping, any chance you could give your Ack to this one before I do
> so, please?
The patch looks reasonable to me, too. My Acked-by is added above.
Thank you, both of you!
Ping
>
> Thanks.
>
> > ---
> > drivers/hid/wacom_sys.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> > index eaf099b2efdb..e74c1a4c5b61 100644
> > --- a/drivers/hid/wacom_sys.c
> > +++ b/drivers/hid/wacom_sys.c
> > @@ -2901,6 +2901,7 @@ static void wacom_remove(struct hid_device *hdev)
> > hid_hw_stop(hdev);
> >
> > cancel_delayed_work_sync(&wacom->init_work);
> > + cancel_delayed_work_sync(&wacom->aes_battery_work);
> > cancel_work_sync(&wacom->wireless_work);
> > cancel_work_sync(&wacom->battery_work);
> > cancel_work_sync(&wacom->remote_work);
> > --
> > 2.39.5
> >
>
> --
> Jiri Kosina
> SUSE Labs
>
>
Powered by blists - more mailing lists