Skip to content

Commit 1ea050d

Browse files
Michal Peciogregkh
authored andcommitted
usb: xhci: Fix invalid pointer dereference in Etron workaround
This check is performed before prepare_transfer() and prepare_ring(), so enqueue can already point at the final link TRB of a segment. And indeed it will, some 0.4% of times this code is called. Then enqueue + 1 is an invalid pointer. It will crash the kernel right away or load some junk which may look like a link TRB and cause the real link TRB to be replaced with a NOOP. This wouldn't end well. Use a functionally equivalent test which doesn't dereference the pointer and always gives correct result. Something has crashed my machine twice in recent days while playing with an Etron HC, and a control transfer stress test ran for confirmation has just crashed it again. The same test passes with this patch applied. Fixes: 5e1c67a ("xhci: Fix control transfer error on Etron xHCI host") Cc: [email protected] Signed-off-by: Michal Pecio <[email protected]> Signed-off-by: Mathias Nyman <[email protected]> Reviewed-by: Kuangyi Chiang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9e3a287 commit 1ea050d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/usb/host/xhci-ring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3777,7 +3777,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
37773777
* enqueue a No Op TRB, this can prevent the Setup and Data Stage
37783778
* TRB to be breaked by the Link TRB.
37793779
*/
3780-
if (trb_is_link(ep_ring->enqueue + 1)) {
3780+
if (last_trb_on_seg(ep_ring->enq_seg, ep_ring->enqueue + 1)) {
37813781
field = TRB_TYPE(TRB_TR_NOOP) | ep_ring->cycle_state;
37823782
queue_trb(xhci, ep_ring, false, 0, 0,
37833783
TRB_INTR_TARGET(0), field);

0 commit comments

Comments
 (0)