patch "usb: hcd: out of bounds access in for_each_companion" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
usb: hcd: out of bounds access in for_each_companion
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
e86103a75705c7c530768f4ffaba74cf382910f2Mon Sep 17 00:00:00 2001
From: Robert Dobrowolski <[email protected]>
Date: Thu, 24 Mar 2016 03:30:07 -0700
Subject: usb: hcd: out of bounds access in for_each_companion
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.
--- drivers/usb/core/hcd-pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/core/hcd-pci.c +9 -0
@@ -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 ;
Signature · 1 line
2.8.0