Skip to content

Commit 099cf1f

Browse files
Andrei Kuchynskigregkh
authored andcommitted
usb: typec: displayport: Fix potential deadlock
The deadlock can occur due to a recursive lock acquisition of `cros_typec_altmode_data::mutex`. The call chain is as follows: 1. cros_typec_altmode_work() acquires the mutex 2. typec_altmode_vdm() -> dp_altmode_vdm() -> 3. typec_altmode_exit() -> cros_typec_altmode_exit() 4. cros_typec_altmode_exit() attempts to acquire the mutex again To prevent this, defer the `typec_altmode_exit()` call by scheduling it rather than calling it directly from within the mutex-protected context. Cc: stable <[email protected]> Fixes: b4b38ff ("usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode") Signed-off-by: Andrei Kuchynski <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent af4db5a commit 099cf1f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/usb/typec/altmodes/displayport.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ static int dp_altmode_vdm(struct typec_altmode *alt,
394394
case CMDT_RSP_NAK:
395395
switch (cmd) {
396396
case DP_CMD_STATUS_UPDATE:
397-
if (typec_altmode_exit(alt))
398-
dev_err(&dp->alt->dev, "Exit Mode Failed!\n");
397+
dp->state = DP_STATE_EXIT;
399398
break;
400399
case DP_CMD_CONFIGURE:
401400
dp->data.conf = 0;

0 commit comments

Comments
 (0)