Unverified Commit d2c4f441 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15309 usb: xhci: Fix NULL pointer dereference on certain command aborts 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/IR4RVADRTWIF5TRDS4FZ6PLEVZNMXNFQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPBJC 
 
Link:https://gitee.com/openeuler/kernel/pulls/15309

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 250eff09 7e65f151

drivers/usb/host/xhci-ring.c

+2 −1
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci, 
	if ((xhci->cmd_ring->dequeue != xhci->cmd_ring->enqueue) &&

	    !(xhci->xhc_state & XHCI_STATE_DYING)) {

		xhci->current_cmd = cur_cmd;

		if (cur_cmd)

			xhci_mod_cmd_timer(xhci);

		xhci_ring_cmd_db(xhci);

	}