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

bentiss · bentiss · commit 3ba2824ca2e3 · 2023-02-22T10:38:38.000+01:00
prevent UAF in delayed work (Benjamin Tissoires)
diff --git a/drivers/hid/hid-mcp2221.c b/drivers/hid/hid-mcp2221.c
@@ -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 */
 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)

Original file line number	Diff line number	Diff line change
`@@ -922,6 +922,9 @@ static void mcp2221_hid_unregister(void *ptr)`
`922`	`922`	`/* This is needed to be sure hid_hw_stop() isn't called twice by the subsystem */`
`923`	`923`	`static void mcp2221_remove(struct hid_device *hdev)`
`924`	`924`	`{`
	`925`	`+ struct mcp2221 *mcp = hid_get_drvdata(hdev);`
	`926`	`+`
	`927`	`+ cancel_delayed_work_sync(&mcp->init_work);`
`925`	`928`	`}`
`926`	`929`
`927`	`930`	`#if IS_REACHABLE(CONFIG_IIO)`