Skip to contentSkip to conversation

usb: dwc3: ep0: return early on NULL requests

DISCUSSION Dave Jones 2 participants 2 messages Nov 10, 2014 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dave Jones

author
#1 lore raw
Quoted 12 lines · Linux Kernel
Gitweb:     http://git.kernel.org/linus/;a=commit;h=6856d30c6c0038dc0648009853533af3af6c5ba8
Commit:     6856d30c6c0038dc0648009853533af3af6c5ba8
Parent:     7d643664ea559b36188cae264047ce3c9bfec3a2
Refname:    refs/heads/master
Author:     Felipe Balbi <[email protected]>
AuthorDate: Tue Sep 30 11:43:20 2014 -0500
Committer:  Felipe Balbi <[email protected]>
CommitDate: Mon Oct 20 15:58:49 2014 -0500

usb: dwc3: ep0: return early on NULL requests

if our list of requests is empty, return early.

....

drivers/usb/dwc3/ep0.c static void dwc3_ep0_complete_data(struct dwc3 *dwc, · line 792

Quoted 12 lines
drivers/usb/dwc3/ep0.c +0 -3
index ae6b575..a47cc1e 100644
@@ -789,9 +789,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
 	dwc->ep0_next_event = DWC3_EP0_NRDY_STATUS;
 
-	r = next_request(&ep0->request_list);
-	ur = &r->request;
-
 	trb = dwc->ep0_trb;

Since the deletion of this assignment to 'r', we're now doing a comparison on it, resulting in dead code that will never be reached..

** CID 1251381: Logically dead code (DEADCODE) /drivers/usb/dwc3/ep0.c: 799 in dwc3_ep0_complete_data()

________________________________________________________________________________________________________
*** CID 1251381: Logically dead code (DEADCODE) /drivers/usb/dwc3/ep0.c: 799 in dwc3_ep0_complete_data() 793
794 status = DWC3_TRB_SIZE_TRBSTS(trb->size);
795 if (status == DWC3_TRBSTS_SETUP_PENDING) {
796 dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
797
798 if (r)

Quoted 2 lines
drivers/usb/dwc3/ep0.c +0 -0
 >>     CID 1251381:  Logically dead code  (DEADCODE)
Quoted 1 line
Quoted 1 line

Execution cannot reach this statement: "dwc3_gadget_giveback(ep0, r...".

799 dwc3_gadget_giveback(ep0, r, -ECONNRESET);
800
801 return;
802 }
803
804 r = next_request(&ep0->request_list);

Picked up by Coverity scan.

Dave

#2 lore raw
Quoted 24 lines · Dave Jones
Quoted 12 lines · Linux Kernel
Gitweb:     http://git.kernel.org/linus/;a=commit;h=6856d30c6c0038dc0648009853533af3af6c5ba8
Commit:     6856d30c6c0038dc0648009853533af3af6c5ba8
Parent:     7d643664ea559b36188cae264047ce3c9bfec3a2
Refname:    refs/heads/master
Author:     Felipe Balbi <[email protected]>
AuthorDate: Tue Sep 30 11:43:20 2014 -0500
Committer:  Felipe Balbi <[email protected]>
CommitDate: Mon Oct 20 15:58:49 2014 -0500

usb: dwc3: ep0: return early on NULL requests

if our list of requests is empty, return early.

....

Quoted 8 lines
drivers/usb/dwc3/ep0.c +0 -0
index ae6b575..a47cc1e 100644
@@ -789,9 +789,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
 	dwc->ep0_next_event = DWC3_EP0_NRDY_STATUS;
 
Quoted 9 lines

drivers/usb/dwc3/ep0.c static void dwc3_ep0_complete_data(struct dwc3 *dwc, · line 792

Quoted 4 lines
drivers/usb/dwc3/ep0.c +0 -3
-	r = next_request(&ep0->request_list);
-	ur = &r->request;
-
 	trb = dwc->ep0_trb;

Since the deletion of this assignment to 'r', we're now doing a comparison on it, resulting in dead code that will never be reached..

very true, here's a patch to fix it up again :-) i'll send it properly in a bit.

drivers/usb/dwc3/ep0.c +4 -4
index 711b230..df38e7e 100644
@@ -791,6 +791,10 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
 	trb = dwc->ep0_trb;
 
+	r = next_request(&ep0->request_list);
+	if (!r)
+		return;
+
 	status = DWC3_TRB_SIZE_TRBSTS(trb->size);
 	if (status == DWC3_TRBSTS_SETUP_PENDING) {
 		dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
@@ -801,10 +805,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 		return;
 	}
 
-	r = next_request(&ep0->request_list);
-	if (!r)
-		return;
-
 	ur = &r->request;
 
 	length = trb->size & DWC3_TRB_SIZE_MASK;
Signature · 1 line
balbi