projects/linux·commit e86103a7

usb: hcd: out of bounds access in for_each_companion

e86103a7 · Robert Dobrowolski <[email protected]> · 2016-03-24 03:30:07 -07:00

On BXT platform Host Controller and Device Controller figure as
same PCI device but with different device function. HCD should
not pass data to Device Controller but only to Host Controllers.
Checking if companion device is Host Controller, otherwise skip.

Cc: <[email protected]>
Signed-off-by: Robert Dobrowolski <[email protected]>
Acked-by: Alan Stern <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Commit
e86103a75705c7c530768f4ffaba74cf382910f2
Parents
13630746

Changes

1 files changed · +9 −0

FileStatusAddDelContent
drivers/usb/core/hcd-pci.cmodified+9−0View file

drivers/usb/core/hcd-pci.c

View file
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index f9d42cf..7859d73 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -73,6 +73,15 @@ static void for_each_companion(struct pci_dev *pdev, struct usb_hcd *hcd,
if (companion->bus != pdev->bus ||
PCI_SLOT(companion->devfn) != slot)
continue;
+
+ /*
+ * Companion device should be either UHCI,OHCI or EHCI host
+ * controller, otherwise skip.
+ */
+ if (companion->class != CL_UHCI && companion->class != CL_OHCI &&
+ companion->class != CL_EHCI)
+ continue;
+
companion_hcd = pci_get_drvdata(companion);
if (!companion_hcd || !companion_hcd->self.root_hub)
continue;