Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

xhci: dbc: fix bogus 1024 byte prefix if ttyDBC read races with stall event

DbC may add 1024 bogus bytes to the beginneing of the receiving endpoint
if DbC hw triggers a STALL event before any Transfer Blocks (TRBs) for
incoming data are queued, but driver handles the event after it queued
the TRBs.

This is possible as xHCI DbC hardware may trigger spurious STALL transfer
events even if endpoint is empty. The STALL event contains a pointer
to the stalled TRB, and "remaining" untransferred data length.

As there are no TRBs queued yet the STALL event will just point to first
TRB position of the empty ring, with '0' bytes remaining untransferred.

DbC driver is polling for events, and may not handle the STALL event
before /dev/ttyDBC0 is opened and incoming data TRBs are queued.

The DbC event handler will now assume the first queued TRB (length 1024)
has stalled with '0' bytes remaining untransferred, and copies the data

This race situation can be practically mitigated by making sure the event
handler handles all pending transfer events when DbC reaches configured
state, and only then create dev/ttyDbC0, and start queueing transfers.
The event handler can this way detect the STALL events on empty rings
and discard them before any transfers are queued.

This does in practice solve the issue, but still leaves a small possible
gap for the race to trigger.
We still need a way to distinguish spurious STALLs on empty rings with '0'
bytes remaing, from actual STALL events with all bytes transmitted.

Cc: stable <stable@kernel.org>
Fixes: dfba2174dc42 ("usb: xhci: Add DbC support in xHCI driver")
Tested-by: Łukasz Bartosik <ukaszb@chromium.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Mathias Nyman and committed by
Greg Kroah-Hartman
f3d12ec8 8607edcd

+4 -2
+4 -2
drivers/usb/host/xhci-dbgcap.c
··· 892 892 dev_info(dbc->dev, "DbC configured\n"); 893 893 portsc = readl(&dbc->regs->portsc); 894 894 writel(portsc, &dbc->regs->portsc); 895 - return EVT_GSER; 895 + ret = EVT_GSER; 896 + break; 896 897 } 897 898 898 899 return EVT_DONE; ··· 955 954 break; 956 955 case TRB_TYPE(TRB_TRANSFER): 957 956 dbc_handle_xfer_event(dbc, evt); 958 - ret = EVT_XFER_DONE; 957 + if (ret != EVT_GSER) 958 + ret = EVT_XFER_DONE; 959 959 break; 960 960 default: 961 961 break;