patch "usb: host: xhci: Fix possible wild pointer when handling abort" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: host: xhci: Fix possible wild pointer when handling abort
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
2a7cfdf37b7c08ac29df4c62ea5ccb01474b6597Mon Sep 17 00:00:00 2001
From: Baolin Wang <[email protected]>
Date: Tue, 3 Jan 2017 18:28:47 +0200
Subject: usb: host: xhci: Fix possible wild pointer when handling abort
command
When current command was supposed to be aborted, host will free the command in handle_cmd_completion() function. But it might be still referenced by xhci->current_cmd, which need to set NULL.
--- drivers/usb/host/xhci-ring.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +4 -1
@@ -1363,8 +1363,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,*/ if (cmd_comp_code ==COMP_CMD_ABORT ) { xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ; -if (cmd->status ==COMP_CMD_ABORT ) +if (cmd->status ==COMP_CMD_ABORT ) { +if (xhci->current_cmd == cmd) + xhci->current_cmd =NULL ; goto event_handled; + } } cmd_type =TRB_FIELD_TO_TYPE (le32_to_cpu (cmd_trb->generic.field[3 ]));
Signature · 1 line
2.11.0