Commit b4c21f0b authored Jun 11, 2015 by Kishon Vijay Abraham I Committed by Felipe Balbi Jul 06, 2015

usb: gadget: composite: Fix NULL pointer dereference



commit f563d230 ("usb: gadget: composite: add req_match method
to usb_function") accesses cdev->config even before set config
is invoked causing a NULL pointer dereferencing error while running
Lecroy Mass Storage Compliance test.

Fix it here by accessing cdev->config only if it is non NULL.

Fixes: commit f563d230 ("usb: gadget: composite: add req_match
method to usb_function").

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 4088acf1

drivers/usb/gadget/composite.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1758,10 +1758,13 @@ composite_setup(struct usb_gadget gadget, const struct usb_ctrlrequest ctrl)
		* take such requests too, if that's ever needed: to work
		* in config 0, etc.
		*/
		if (cdev->config) {
		list_for_each_entry(f, &cdev->config->functions, list)
		if (f->req_match && f->req_match(f, ctrl))
		goto try_fun_setup;
		f = NULL;
		}

		switch (ctrl->bRequestType & USB_RECIP_MASK) {
		case USB_RECIP_INTERFACE:
		if (!cdev->config \|\| intf >= MAX_CONFIG_INTERFACES)