usb: renesas_usbhs: gadget: fix NULL pointer dereference in ep_disable()
authorKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Tue, 4 Nov 2014 01:05:42 +0000 (10:05 +0900)
committerFelipe Balbi <balbi@ti.com>
Wed, 5 Nov 2014 19:22:05 +0000 (13:22 -0600)
This patch fixes an issue that the NULL pointer dereference happens
when we uses g_audio driver. Since the g_audio driver will call
usb_ep_disable() in afunc_set_alt() before it calls usb_ep_enable(),
the uep->pipe of renesas usbhs driver will be NULL. So, this patch
adds a condition to avoid the oops.

Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Fixes: 2f98382dc (usb: renesas_usbhs: Add Renesas USBHS Gadget)
Cc: <stable@vger.kernel.org> # v3.0+
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/renesas_usbhs/mod_gadget.c

index 7a452103050592b91cf7ecce8a3e4a6cd7591402..ac51b594590dde5c67b3be5a1690a7208091b550 100644 (file)
@@ -602,6 +602,9 @@ static int usbhsg_ep_disable(struct usb_ep *ep)
        struct usbhsg_uep *uep = usbhsg_ep_to_uep(ep);
        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
 
+       if (!pipe)
+               return -EINVAL;
+
        usbhsg_pipe_disable(uep);
        usbhs_pipe_free(pipe);