| Message ID | 1558524841-25397-4-git-send-email-mathias.nyman@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 7aa1bb2ffd84d6b9b5f546b079bb15cd0ab6e76e |
| Headers | show |
| Series | xhci fixes for usb-linus | expand |
Hi Sasha, i was OOO last week. Let me check why the patch doesn't apply in the older kernel series. I originally developed it on a 4.14.86 and ported it to 5.1. Shouldn't be a big problem, its a "one line mover" only. BR Carsten > -----Ursprüngliche Nachricht----- > Von: Sasha Levin [mailto:sashal@kernel.org] > Gesendet: Mittwoch, 29. Mai 2019 15:15 > An: Sasha Levin <sashal@kernel.org>; Mathias Nyman > <mathias.nyman@linux.intel.com>; Schmid, Carsten > <Carsten_Schmid@mentor.com>; gregkh@linuxfoundation.org > Cc: linux-usb@vger.kernel.org; Stable <stable@vger.kernel.org>; > stable@vger.kernel.org > Betreff: Re: [PATCH 3/5] usb: xhci: avoid null pointer deref when bos field is > NULL > > Hi, > > [This is an automated email] > > This commit has been processed because it contains a -stable tag. > The stable tag indicates that it's relevant for the following trees: all > > The bot has tested the following trees: v5.1.4, v5.0.18, v4.19.45, v4.14.121, > v4.9.178, v4.4.180, v3.18.140. > > v5.1.4: Build OK! > v5.0.18: Build OK! > v4.19.45: Build OK! > v4.14.121: Failed to apply! Possible dependencies: > 01451ad47e272 ("powerpc/powermac: Use setup_timer() helper") > 38986ffa6a748 ("xhci: use port structures instead of port arrays in xhci.c > functions") > 83ad1e6a1dc04 ("powerpc/oprofile: Use setup_timer() helper") > 8d6b1bf20f61c ("powerpc/6xx: Use setup_timer() helper") > b1fc2839d2f92 ("drm/msm: Implement preemption for A5XX targets") > b9eaf18722221 ("treewide: init_timer() -> setup_timer()") > cd414f3d93168 ("drm/msm: Move memptrs to msm_gpu") > e629cfa36ea08 ("MIPS: Lasat: Use setup_timer() helper") > e99e88a9d2b06 ("treewide: setup_timer() -> timer_setup()") > eec874ce5ff1f ("drm/msm/adreno: load gpu at probe/bind time") > f7de15450e906 ("drm/msm: Add per-instance submit queues") > f97decac5f4c2 ("drm/msm: Support multiple ringbuffers") > > v4.9.178: Failed to apply! Possible dependencies: > 01451ad47e272 ("powerpc/powermac: Use setup_timer() helper") > 38986ffa6a748 ("xhci: use port structures instead of port arrays in xhci.c > functions") > 53460c53b7619 ("[media] au0828: Add timer to restart TS stream if no data > arrives on bulk endpoint") > 7c96f59e0cafe ("[media] s5p-mfc: Fix initialization of internal structures") > 83ad1e6a1dc04 ("powerpc/oprofile: Use setup_timer() helper") > 8d6b1bf20f61c ("powerpc/6xx: Use setup_timer() helper") > b9eaf18722221 ("treewide: init_timer() -> setup_timer()") > cf43e6be865a5 ("block: add scalable completion tracking of requests") > e629cfa36ea08 ("MIPS: Lasat: Use setup_timer() helper") > e806402130c9c ("block: split out request-only flags into a new namespace") > e99e88a9d2b06 ("treewide: setup_timer() -> timer_setup()") > > v4.4.180: Failed to apply! Possible dependencies: > 01451ad47e272 ("powerpc/powermac: Use setup_timer() helper") > 37f895d7e85e7 ("NFC: pn533: Fix socket deadlock") > 38986ffa6a748 ("xhci: use port structures instead of port arrays in xhci.c > functions") > 53460c53b7619 ("[media] au0828: Add timer to restart TS stream if no data > arrives on bulk endpoint") > 7c96f59e0cafe ("[media] s5p-mfc: Fix initialization of internal structures") > 80c1bce9aa315 ("[media] au0828: Refactoring for start_urb_transfer()") > 83ad1e6a1dc04 ("powerpc/oprofile: Use setup_timer() helper") > 8d6b1bf20f61c ("powerpc/6xx: Use setup_timer() helper") > 9815c7cf22dac ("NFC: pn533: Separate physical layer from the core > implementation") > b9eaf18722221 ("treewide: init_timer() -> setup_timer()") > e629cfa36ea08 ("MIPS: Lasat: Use setup_timer() helper") > e997ebbe46fe4 ("NFC: pn533: Send ATR_REQ only if > NFC_PROTO_NFC_DEP bit is set") > e99e88a9d2b06 ("treewide: setup_timer() -> timer_setup()") > > v3.18.140: Failed to apply! Possible dependencies: > 0a5942c8e1480 ("NFC: Add ACPI support for NXP PN544") > 34ac49664149d ("NFC: nci: remove current SLEEP mode management") > 3590ebc040c9e ("NFC: logging neatening") > 3682f49f32051 ("NFC: netlink: Add new netlink command > NFC_CMD_ACTIVATE_TARGET") > 37f895d7e85e7 ("NFC: pn533: Fix socket deadlock") > 38986ffa6a748 ("xhci: use port structures instead of port arrays in xhci.c > functions") > 53460c53b7619 ("[media] au0828: Add timer to restart TS stream if no data > arrives on bulk endpoint") > 5df848f37b1d2 ("NFC: pn533: fix error return code") > 7c96f59e0cafe ("[media] s5p-mfc: Fix initialization of internal structures") > 80c1bce9aa315 ("[media] au0828: Refactoring for start_urb_transfer()") > 9295b5b569fc4 ("NFC: nci: Add support for different > NCI_DEACTIVATE_TYPE") > 96d4581f0b371 ("NFC: netlink: Add mode parameter to deactivate_target > functions") > 9815c7cf22dac ("NFC: pn533: Separate physical layer from the core > implementation") > b9eaf18722221 ("treewide: init_timer() -> setup_timer()") > d7979e130ebb0 ("NFC: NCI: Signal deactivation in Target mode") > e997ebbe46fe4 ("NFC: pn533: Send ATR_REQ only if > NFC_PROTO_NFC_DEP bit is set") > e99e88a9d2b06 ("treewide: setup_timer() -> timer_setup()") > > > How should we proceed with this patch? > > -- > Thanks, > Sasha
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index a9bb796..048a675 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4320,7 +4320,6 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd, pm_addr = ports[port_num]->addr + PORTPMSC; pm_val = readl(pm_addr); hlpm_addr = ports[port_num]->addr + PORTHLPMC; - field = le32_to_cpu(udev->bos->ext_cap->bmAttributes); xhci_dbg(xhci, "%s port %d USB2 hardware LPM\n", enable ? "enable" : "disable", port_num + 1); @@ -4332,6 +4331,7 @@ static int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd, * default one which works with mixed HIRD and BESL * systems. See XHCI_DEFAULT_BESL definition in xhci.h */ + field = le32_to_cpu(udev->bos->ext_cap->bmAttributes); if ((field & USB_BESL_SUPPORT) && (field & USB_BESL_BASELINE_VALID)) hird = USB_GET_BESL_BASELINE(field);