This is a note to let you know that I've just added the patch titled
HID: mcp-2221: prevent UAF in delayed work
to the 6.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hid-mcp-2221-prevent-uaf-in-delayed-work.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 47e91fdfa511139f2549687edb0d8649b123227b Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Date: Thu, 16 Feb 2023 11:22:58 +0100
Subject: HID: mcp-2221: prevent UAF in delayed work
From: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
commit 47e91fdfa511139f2549687edb0d8649b123227b upstream.
If the device is plugged/unplugged without giving time for mcp_init_work()
to complete, we might kick in the devm free code path and thus have
unavailable struct mcp_2221 while in delayed work.
Canceling the delayed_work item is enough to solve the issue, because
cancel_delayed_work_sync will prevent the work item to requeue itself.
Fixes: 960f9df7c620 ("HID: mcp2221: add ADC/DAC support via iio subsystem")
CC: stable@xxxxxxxxxxxxxxx
Acked-by: Jiri Kosina <jkosina@xxxxxxx>
Link: https://lore.kernel.org/r/20230215-wip-mcp2221-v2-1-109f71fd036e@xxxxxxxxxx
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/hid/hid-mcp2221.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/hid/hid-mcp2221.c
+++ b/drivers/hid/hid-mcp2221.c
@@ -922,6 +922,9 @@ static void mcp2221_hid_unregister(void
/* This is needed to be sure hid_hw_stop() isn't called twice by the subsystem */
static void mcp2221_remove(struct hid_device *hdev)
{
+ struct mcp2221 *mcp = hid_get_drvdata(hdev);
+
+ cancel_delayed_work_sync(&mcp->init_work);
}
#if IS_REACHABLE(CONFIG_IIO)
Patches currently in stable-queue which might be from benjamin.tissoires@xxxxxxxxxx are
queue-6.2/hid-mcp-2221-prevent-uaf-in-delayed-work.patch
