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

Commit 6ee96cc0 authored by Andreas Larsson's avatar Andreas Larsson Committed by Felipe Balbi
Browse files

usb: gadget: gr_udc: Fix check for invalid number of microframes 



The value 0x3 (not 0x11) in the field for additional transaction/microframe
is reserved and should not be let through. Be clear in the error message about
what value caused the error return.

Reported-by: default avatarDavid Binderman <dcb314@hotmail.com>
Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 7adb5c87

drivers/usb/gadget/gr_udc.c

+3 −2
Original line number Diff line number Diff line
@@ -1532,8 +1532,9 @@ static int gr_ep_enable(struct usb_ep *_ep, 
			"%s mode: multiple trans./microframe not valid\n",

			(mode == 2 ? "Bulk" : "Control"));

		return -EINVAL;

	} else if (nt == 0x11) {

		dev_err(dev->dev, "Invalid value for trans./microframe\n");

	} else if (nt == 0x3) {

		dev_err(dev->dev,

			"Invalid value 0x3 for additional trans./microframe\n");

		return -EINVAL;

	} else if ((nt + 1) * max > buffer_size) {

		dev_err(dev->dev, "Hw buffer size %d < max payload %d * %d\n",