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

Commit ff085de7 authored by Jassi Brar's avatar Jassi Brar Committed by Greg Kroah-Hartman
Browse files

USB: Gadget: Composite: Debug interface comparison 



While checking valid interface number we should compare MAX_CONFIG_INTERFACES
with the variable 'intf' (which holds the lower 8bits of w_index) rather than
'w_index'

Signed-off-by: default avatarJassi Brar <jassi.brar@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66b0835e

drivers/usb/gadget/composite.c

+3 −3
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
	case USB_REQ_SET_INTERFACE:

		if (ctrl->bRequestType != USB_RECIP_INTERFACE)

			goto unknown;

		if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)

		if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)

			break;

		f = cdev->config->interface[intf];

		if (!f)
@@ -899,7 +899,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
	case USB_REQ_GET_INTERFACE:

		if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))

			goto unknown;

		if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)

		if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)

			break;

		f = cdev->config->interface[intf];

		if (!f)
@@ -928,7 +928,7 @@ unknown: 
		 */

		switch (ctrl->bRequestType & USB_RECIP_MASK) {

		case USB_RECIP_INTERFACE:

			if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)

			if (!cdev->config || intf >= MAX_CONFIG_INTERFACES)

				break;

			f = cdev->config->interface[intf];

			break;