Skip to contentSkip to conversation

Patch "xhci: Set URB actual length for stopped control transfers" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 3, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

xhci: Set URB actual length for stopped control transfers

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xhci-set-urb-actual-length-for-stopped-control-transfers.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0ab2881a406b9fd46224a3e8253bbc0141b4f844 Mon Sep 17 00:00:00 2001

From: Mathias Nyman <[email protected]>
Date: Tue, 28 Mar 2017 15:55:29 +0300
Subject: xhci: Set URB actual length for stopped control transfers

From: Mathias Nyman <[email protected]>

commit 0ab2881a406b9fd46224a3e8253bbc0141b4f844 upstream.

A control transfer that stopped at the status stage incorrectly warned about a "unexpected TRB Type 4", and did not set the transferred actual_length for the URB.

The URB actual_length for control transfers should contain the bytes transferred in the data stage.

Bytes of a partially sent setup stage and missing bytes from status stage should be left out.

---
 drivers/usb/host/xhci-ring.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-ring.c +3 -0
@@ -2000,6 +2000,9 @@ static int process_ctrl_td(struct xhci_h
 		case TRB_NORMAL:
 			td->urb->actual_length = requested - remaining;
 			goto finish_td;
+		case TRB_STATUS:
+			td->urb->actual_length = requested;
+			goto finish_td;
 		default:
 			xhci_warn(xhci, "WARN: unexpected TRB Type %d\n",
 				  trb_type);

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/xhci-set-urb-actual-length-for-stopped-control-transfers.patch