summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorDavid Mosberger-Tang <davidm@egauge.net>2014-05-28 10:06:24 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 13:24:07 -0700
commitf9da25c798ae7d89a25918cc897c17abb1490e13 (patch)
tree7e7e3f508784a3953334c87ad5f127c8b69b35ff /drivers/usb/host
parent357d596ea7bea5abf1479cc72ae5888c738717dd (diff)
downloadop-kernel-dev-f9da25c798ae7d89a25918cc897c17abb1490e13.zip
op-kernel-dev-f9da25c798ae7d89a25918cc897c17abb1490e13.tar.gz
usb: host: max3421-hcd: Fix potential NULL urb dereference
Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David Mosberger <davidm@egauge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/max3421-hcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index dfc74d6..28abda1 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -588,12 +588,14 @@ max3421_next_transfer(struct usb_hcd *hcd, int fast_retransmit)
{
struct max3421_hcd *max3421_hcd = hcd_to_max3421(hcd);
struct urb *urb = max3421_hcd->curr_urb;
- struct max3421_ep *max3421_ep = urb->ep->hcpriv;
+ struct max3421_ep *max3421_ep;
int cmd = -EINVAL;
if (!urb)
return; /* nothing to do */
+ max3421_ep = urb->ep->hcpriv;
+
switch (max3421_ep->pkt_state) {
case PKT_STATE_SETUP:
cmd = max3421_ctrl_setup(hcd, urb);
OpenPOWER on IntegriCloud