Skip to content

L
linux
Commit 3ba2824c authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files
Options

Merge branch 'for-6.3/mcp2221' into for-linus 

prevent UAF in delayed work (Benjamin Tissoires)
parents a74749ef 47e91fdf
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/hid/hid-mcp2221.c
View file @ 3ba2824c
...@@ -922,6 +922,9 @@ static void mcp2221_hid_unregister(void *ptr) ...@@ -922,6 +922,9 @@ static void mcp2221_hid_unregister(void *ptr)
/* This is needed to be sure hid_hw_stop() isn't called twice by the subsystem */ /* This is needed to be sure hid_hw_stop() isn't called twice by the subsystem */
static void mcp2221_remove(struct hid_device *hdev) 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) #if IS_REACHABLE(CONFIG_IIO)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7