staging: dwc2: check for null pointer before dereferencing it
authorPaul Zimmerman <Paul.Zimmerman@synopsys.com>
Mon, 22 Apr 2013 21:00:18 +0000 (14:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Apr 2013 17:37:55 +0000 (10:37 -0700)
We were testing qtd->urb pointer for null after we had already
dereferenced it

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dwc2/hcd_intr.c

index a8d8c53a8b2389cea050e9c582a47052bae58f75..6e5dbed6ccec06d8427b995f88bad428d6fcdf15 100644 (file)
@@ -1377,13 +1377,12 @@ static void dwc2_hc_nyet_intr(struct dwc2_hsotg *hsotg,
                    hsotg->core_params->dma_enable > 0) {
                        qtd->complete_split = 0;
                        qtd->isoc_split_offset = 0;
-                       if (++qtd->isoc_frame_index == qtd->urb->packet_count) {
-                               if (qtd->urb)
-                                       dwc2_host_complete(hsotg,
-                                                          qtd->urb->priv,
-                                                          qtd->urb, 0);
+                       if (qtd->urb &&
+                           ++qtd->isoc_frame_index == qtd->urb->packet_count) {
+                               dwc2_host_complete(hsotg, qtd->urb->priv,
+                                                  qtd->urb, 0);
                                dwc2_release_channel(hsotg, chan, qtd,
-                                               DWC2_HC_XFER_URB_COMPLETE);
+                                                    DWC2_HC_XFER_URB_COMPLETE);
                        } else {
                                dwc2_release_channel(hsotg, chan, qtd,
                                                DWC2_HC_XFER_NO_HALT_STATUS);