summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/composite.c
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2015-03-03 10:52:04 +0100
committerFelipe Balbi <balbi@ti.com>2015-03-10 15:33:33 -0500
commit232c0102e84b7fce634c8902a5fa30ca2b3342ac (patch)
tree2a5c6b96ee1a858a163befe2d7337deddc261b4a /drivers/usb/gadget/composite.c
parenteac68e8f979b82d257eea0a4bbcda7b169d330bf (diff)
downloadop-kernel-dev-232c0102e84b7fce634c8902a5fa30ca2b3342ac.zip
op-kernel-dev-232c0102e84b7fce634c8902a5fa30ca2b3342ac.tar.gz
usb: gadget: composite: don't try standard handling for non-standard requests
If a non-standard request is processed and its parameters just happen to match those of some standard request, the logic of composite_setup() can be fooled, so don't even try any switch cases, just go to the proper place where unknown requests are handled. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
-rw-r--r--drivers/usb/gadget/composite.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 13adfd1..9fb9231 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1472,6 +1472,13 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
req->length = 0;
gadget->ep0->driver_data = cdev;
+ /*
+ * Don't let non-standard requests match any of the cases below
+ * by accident.
+ */
+ if ((ctrl->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD)
+ goto unknown;
+
switch (ctrl->bRequest) {
/* we handle all standard USB descriptors */
OpenPOWER on IntegriCloud