Commit 2a7cfdf3 authored Jan 03, 2017 by Baolin Wang Committed by Greg Kroah-Hartman Jan 03, 2017

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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2b985467

drivers/usb/host/xhci-ring.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1363,9 +1363,12 @@ 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]));
		switch (cmd_type) {