Skip to contentSkip to conversation

drivers: usb: gadget: udc: Fix NULL dereference

PATCH In review Tapasweni Pathak 3 participants 7 messages Mar 3, 2015 – Mar 10, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: usb: gadget: udc: Fix NULL dereference

This patch fixes multiple instances of null pointer dereference in this code.

ep->udc is assigned to udc. ep is just an offset from _ep. _ep is then checked for NULL. udc is dereferenced under the NULL check for _ep, making an invalid pointer reference.

udc is then checked for NULL, if NULL, it is then dereferenced as udc->dev.

To fix these issues, shift assignment of udc by dereferencing ep after null check for _ep, replace both dev_dbg statements with pr_debug.

Found using Coccinelle.

---
 drivers/usb/gadget/udc/lpc32xx_udc.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +3 -4
index 27fd413..6398539 100644
@@ -1807,17 +1807,16 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	    !list_empty(&req->queue))
 		return -EINVAL;
 
-	udc = ep->udc;
-
 	if (!_ep) {
-		dev_dbg(udc->dev, "invalid ep\n");
+		pr_debug("invalid ep\n");
 		return -EINVAL;
 	}
 
+	udc = ep->udc;
 
 	if ((!udc) || (!udc->driver) ||
 	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-		dev_dbg(udc->dev, "invalid device\n");
+		pr_debug("invalid device\n");
 		return -EINVAL;
 	}
 

--
1.7.9.5

#1 lore raw
Quoted 36 lines · Tapasweni Pathak

This patch fixes multiple instances of null pointer dereference in this code.

ep->udc is assigned to udc. ep is just an offset from _ep. _ep is then checked for NULL. udc is dereferenced under the NULL check for _ep, making an invalid pointer reference.

udc is then checked for NULL, if NULL, it is then dereferenced as udc->dev.

To fix these issues, shift assignment of udc by dereferencing ep after null check for _ep, replace both dev_dbg statements with pr_debug.

Found using Coccinelle.

---
 drivers/usb/gadget/udc/lpc32xx_udc.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -3
index 27fd413..6398539 100644
@@ -1807,17 +1807,16 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	    !list_empty(&req->queue))
 		return -EINVAL;
 
-	udc = ep->udc;
-
 	if (!_ep) {
-		dev_dbg(udc->dev, "invalid ep\n");
+		pr_debug("invalid ep\n");
 		return -EINVAL;
 	}

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1822

Quoted 10 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +2 -1
 
+	udc = ep->udc;
 
 	if ((!udc) || (!udc->driver) ||
 	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-		dev_dbg(udc->dev, "invalid device\n");
+		pr_debug("invalid device\n");
 		return -EINVAL;
 	}
 

It is driver code, we'd better use dev_dbg. If _ep exists, both ep and udc should exist. So, how about just checking _ep at the beginning:

drivers/usb/gadget/udc/lpc32xx_udc.c +2 -3
index 27fd413..c65de0e 100644
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}
Signature · 2 lines
Best Regards,
Peter Chen
#2 lore raw
Quoted 66 lines · Peter Chen
Quoted 36 lines · Tapasweni Pathak

This patch fixes multiple instances of null pointer dereference in this code.

ep->udc is assigned to udc. ep is just an offset from _ep. _ep is then checked for NULL. udc is dereferenced under the NULL check for _ep, making an invalid pointer reference.

udc is then checked for NULL, if NULL, it is then dereferenced as udc->dev.

To fix these issues, shift assignment of udc by dereferencing ep after null check for _ep, replace both dev_dbg statements with pr_debug.

Found using Coccinelle.

---
 drivers/usb/gadget/udc/lpc32xx_udc.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -3
index 27fd413..6398539 100644
@@ -1807,17 +1807,16 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	    !list_empty(&req->queue))
 		return -EINVAL;
 
-	udc = ep->udc;
-
 	if (!_ep) {
-		dev_dbg(udc->dev, "invalid ep\n");
+		pr_debug("invalid ep\n");
 		return -EINVAL;
 	}

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1822

Quoted 10 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +2 -1
 
+	udc = ep->udc;
 
 	if ((!udc) || (!udc->driver) ||
 	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-		dev_dbg(udc->dev, "invalid device\n");
+		pr_debug("invalid device\n");
 		return -EINVAL;
 	}
 

It is driver code, we'd better use dev_dbg. If _ep exists, both ep and udc should exist. So, how about just checking _ep at the beginning:

drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
index 27fd413..c65de0e 100644
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1821

Quoted 9 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}

what's going to happen here ?

Signature · 1 line
balbi
#3 lore raw
Quoted 20 lines
Quoted 13 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1818

Quoted 6 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN))

{

Quoted 6 lines

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1821

Quoted 3 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +0 -0
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}

what's going to happen here ?

I just changed the current code, in fact, udc->driver is impossible to NULL which is cleared at .udc_stop.

The speed is possible for unknown if the reset has occurred at that time.

Peter

#4 lore raw
Quoted 24 lines · Peter Chen
Quoted 24 lines
Quoted 13 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1818

Quoted 6 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN))

{

Quoted 3 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +0 -0
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}
Quoted 7 lines
Quoted 2 lines

what's going to happen here ?

I just changed the current code, in fact, udc->driver is impossible to NULL which is cleared at .udc_stop.

The speed is possible for unknown if the reset has occurred at that time.

oh, alright.

Signature · 1 line
balbi
#5 lore raw
Quoted 29 lines · Peter Chen
Quoted 27 lines
Quoted 26 lines
Quoted 13 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1818

Quoted 6 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN))

{

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1821

Quoted 3 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +0 -0
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}

what's going to happen here ?

Quoted 6 lines
Quoted 4 lines

I just changed the current code, in fact, udc->driver is impossible to NULL which is cleared at .udc_stop.

The speed is possible for unknown if the reset has occurred at that time.

oh, alright.

Do you need me or Tapasweni send patch for this?

Peter

#6 lore raw
Quoted 29 lines · Peter Chen
Quoted 29 lines · Peter Chen
Quoted 27 lines
Quoted 26 lines
Quoted 13 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -1
@@ -1803,7 +1803,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	req = container_of(_req, struct lpc32xx_request, req);
 	ep = container_of(_ep, struct lpc32xx_ep, ep);
 
-	if (!_req || !_req->complete || !_req->buf ||
+	if (!_ep || !_req || !_req->complete || !_req->buf ||
 	    !list_empty(&req->queue))
 		return -EINVAL;
 

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1818

Quoted 6 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -1815,8 +1815,7 @@ static int lpc32xx_ep_queue(struct usb_ep *_ep,
 	}
 
 
-	if ((!udc) || (!udc->driver) ||
-	    (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
+	if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN))

{

drivers/usb/gadget/udc/lpc32xx_udc.c static int lpc32xx_ep_queue(struct usb_ep *_ep, · line 1821

Quoted 3 lines
drivers/usb/gadget/udc/lpc32xx_udc.c +0 -0
 		dev_dbg(udc->dev, "invalid device\n");
 		return -EINVAL;
 	}

what's going to happen here ?

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

I just changed the current code, in fact, udc->driver is impossible to NULL which is cleared at .udc_stop.

The speed is possible for unknown if the reset has occurred at that time.

oh, alright.

Do you need me or Tapasweni send patch for this?

if there's anything to be fixed, sure.

Signature · 1 line
balbi