xhci fixes for usb-linus
Subsystems (3)
cover xhci fixes for usb-linus
Hi Greg
A couple xhci fixes for 6.9 rc
The null pointer dereferece fix solves a regression in 6.9-rc1, so no need to add it to stable
Thanks
-Mathias
Mathias Nyman (1):
xhci: Fix root hub port null pointer dereference in xhci tracepoints
Oliver Neukum (1):
usb: xhci: correct return value in case of STS_HCE
drivers/usb/host/xhci-ring.c | 9 ++++----- drivers/usb/host/xhci-trace.h | 12 +++++------- 2 files changed, 9 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 usb: xhci: correct return value in case of STS_HCE
From: Oliver Neukum <[email protected]>
If we get STS_HCE we give up on the interrupt, but for the purpose of IRQ handling that still counts as ours. We may return IRQ_NONE only if we are positive that it wasn't ours. Hence correct the default.
--- drivers/usb/host/xhci-ring.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-ring.c +4 -5
@@ -3133,7 +3133,7 @@ static int xhci_handle_events(struct xhci_hcd *xhci, struct xhci_interrupter *irirqreturn_t xhci_irq (struct usb_hcd *hcd) {struct xhci_hcd *xhci =hcd_to_xhci (hcd); -irqreturn_t ret =IRQ_NONE ; +irqreturn_t ret =IRQ_HANDLED ;u32 status;spin_lock (&xhci->lock);
@@ -3141,12 +3141,13 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) status =readl (&xhci->op_regs->status);if (status == ~(u32 )0 ) {xhci_hc_died (xhci); - ret =IRQ_HANDLED ; goto out; } -if (!(status &STS_EINT )) +if (!(status &STS_EINT )) { + ret =IRQ_NONE ; goto out; + }if (status &STS_HCE ) {xhci_warn (xhci,"WARNING: Host Controller Error\n" );
@@ -3156,7 +3157,6 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)if (status &STS_FATAL ) {xhci_warn (xhci,"WARNING: Host System Error\n" );xhci_halt (xhci); - ret =IRQ_HANDLED ; goto out; }
@@ -3167,7 +3167,6 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)*/ status |=STS_EINT ;writel (status, &xhci->op_regs->status); - ret =IRQ_HANDLED ;/* This is the handler of the primary interrupter */ xhci_handle_events (xhci, xhci->interrupters[0 ]);
Signature · 1 line
2.25.1
PATCH 2/2 xhci: Fix root hub port null pointer dereference in xhci tracepoints
In reply to Mathias NymanThe pointer from a xhci usb virt device to its root hub port (vdev->rhub_port) is set later when device is addressed, not while vdev is allocated.
Tracepoints dereferenced this rhub_port pointer when freeing the virt device, which causes null pointer dereference if tracing is enabled and device is freed before addressed.
This can happen if tracing is enabled and xhci driver is unloaded before a device is fully enumerated, or initial enumeration fails and device is reset and freed before retry.
Don't dereference the rhub_port or show port numbers when tracing xhci_free_virt_device(). This info is not very useful anyway.
Print the more useful slot id instead
--- drivers/usb/host/xhci-trace.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/usb/host/xhci-trace.h +5 -7
@@ -172,8 +172,7 @@ DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, __field(void *, vdev) __field(unsigned long long, out_ctx) __field(unsigned long long, in_ctx) - __field(int, hcd_portnum) - __field(int, hw_portnum) + __field(int, slot_id) __field(u16, current_mel) ),
@@ -181,13 +180,12 @@ DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, __entry->vdev = vdev; __entry->in_ctx = (unsigned long long ) vdev->in_ctx->dma; __entry->out_ctx = (unsigned long long ) vdev->out_ctx->dma; - __entry->hcd_portnum = (int ) vdev->rhub_port->hcd_portnum; - __entry->hw_portnum = (int ) vdev->rhub_port->hw_portnum; + __entry->slot_id = (int ) vdev->slot_id; __entry->current_mel = (u16 ) vdev->current_mel; ), -TP_printk ("vdev %p ctx %llx | %llx hcd_portnum %d hw_portnum %d current_mel %d" , - __entry->vdev, __entry->in_ctx, __entry->out_ctx, - __entry->hcd_portnum, __entry->hw_portnum, __entry->current_mel +TP_printk ("vdev %p slot %d ctx %llx | %llx current_mel %d" , + __entry->vdev, __entry->slot_id, __entry->in_ctx, + __entry->out_ctx, __entry->current_mel ) );
Signature · 1 line
2.25.1