Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89066b36 authored by John Keeping's avatar John Keeping Committed by Felipe Balbi
Browse files

usb: dwc2: avoid NULL dereferences 



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

Fixes: 1b4977c7 ("usb: dwc2: Update dwc2_handle_incomplete_isoc_in() function")
Fixes: 689efb26 ("usb: dwc2: Update dwc2_handle_incomplete_isoc_out() function")
Fixes: d8484552 ("usb: dwc2: Update GINTSTS_GOUTNAKEFF interrupt handling")
Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent a39ba90a

drivers/usb/dwc2/gadget.c

+3 −3
Original line number Diff line number Diff line
@@ -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++) {

		hs_ep = hsotg->eps_in[idx];

		/* Proceed only unmasked ISOC EPs */

		if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

		if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

			continue;



		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++) {

		hs_ep = hsotg->eps_out[idx];

		/* Proceed only unmasked ISOC EPs */

		if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

		if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

			continue;



		epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
@@ -3650,7 +3650,7 @@ static irqreturn_t dwc2_hsotg_irq(int irq, void *pw) 
		for (idx = 1; idx < hsotg->num_of_eps; idx++) {

			hs_ep = hsotg->eps_out[idx];

			/* Proceed only unmasked ISOC EPs */

			if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))

			if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)

				continue;



			epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));