FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 19:43:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: dwc2: avoid NULL dereferences

Browse Source 
For unidirectional endpoints, the endpoint pointer will be NULL for the
unused direction.  Check that the endpoint is active before
dereferencing this pointer.

Fixes: 1b4977c793d3 ("usb: dwc2: Update dwc2_handle_incomplete_isoc_in() function")
Fixes: 689efb2619b5 ("usb: dwc2: Update dwc2_handle_incomplete_isoc_out() function")
Fixes: d84845522d93 ("usb: dwc2: Update GINTSTS_GOUTNAKEFF interrupt handling")
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
John Keeping 2018-07-15 15:50:43 +01:00 committed by Felipe Balbi
parent a39ba90a1c
commit 89066b36c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/dwc2/gadget.c
View File

@ -3430,7 +3430,7 @@ static void dwc2_gadget_handle_incomplete_isoc_in(struct dwc2_hsotg *hsotg)
for (idx = 1; idx < hsotg->num_of_eps; idx++) { for (idx = 1; idx < hsotg->num_of_eps; idx++) {
hs_ep = hsotg->eps_in[idx]; hs_ep = hsotg->eps_in[idx];
/* Proceed only unmasked ISOC EPs */ /* Proceed only unmasked ISOC EPs */
if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk)) if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
continue; continue;
epctrl = dwc2_readl(hsotg->regs + DIEPCTL(idx)); epctrl = dwc2_readl(hsotg->regs + DIEPCTL(idx));
@ -3476,7 +3476,7 @@ static void dwc2_gadget_handle_incomplete_isoc_out(struct dwc2_hsotg *hsotg)
for (idx = 1; idx < hsotg->num_of_eps; idx++) { for (idx = 1; idx < hsotg->num_of_eps; idx++) {
hs_ep = hsotg->eps_out[idx]; hs_ep = hsotg->eps_out[idx];
/* Proceed only unmasked ISOC EPs */ /* Proceed only unmasked ISOC EPs */
if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk)) if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
continue; continue;
epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx)); epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
@ -3650,7 +3650,7 @@ irq_retry:
for (idx = 1; idx < hsotg->num_of_eps; idx++) { for (idx = 1; idx < hsotg->num_of_eps; idx++) {
hs_ep = hsotg->eps_out[idx]; hs_ep = hsotg->eps_out[idx];
/* Proceed only unmasked ISOC EPs */ /* Proceed only unmasked ISOC EPs */
if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk)) if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
continue; continue;
epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx)); epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));