Skip to content

Commit 84d5208

Browse files
Andrei Kuchynskismb49
authored andcommitted
usb: typec: ucsi: displayport: Fix NULL pointer access
BugLink: https://bugs.launchpad.net/bugs/2115252 commit 312d796 upstream. This patch ensures that the UCSI driver waits for all pending tasks in the ucsi_displayport_work workqueue to finish executing before proceeding with the partner removal. Cc: stable <[email protected]> Fixes: af8622f ("usb: typec: ucsi: Support for DisplayPort alt mode") Signed-off-by: Andrei Kuchynski <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Reviewed-by: Benson Leung <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> CVE-2025-37994 Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 717d4e6 commit 84d5208

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/usb/typec/ucsi/displayport.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ void ucsi_displayport_remove_partner(struct typec_altmode *alt)
299299
if (!dp)
300300
return;
301301

302+
cancel_work_sync(&dp->work);
303+
302304
dp->data.conf = 0;
303305
dp->data.status = 0;
304306
dp->initialized = false;

0 commit comments

Comments
 (0)