From: Julia Lawall <julia@xxxxxxx> Error handling code following a usb_alloc_urb should free the allocated data. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = usb_alloc_urb(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s alloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/usb/wusbcore/devconnect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/usb/wusbcore/devconnect.c~drivers-usb-wusbcore-introduce-missing-usb_free_urb drivers/usb/wusbcore/devconnect.c --- a/drivers/usb/wusbcore/devconnect.c~drivers-usb-wusbcore-introduce-missing-usb_free_urb +++ a/drivers/usb/wusbcore/devconnect.c @@ -123,7 +123,7 @@ static struct wusb_dev *wusb_dev_alloc(s req = kmalloc(sizeof(*req), GFP_KERNEL); if (req == NULL) - goto err; + goto err2; wusb_dev->set_gtk_req = req; req->bRequestType = USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE; @@ -133,6 +133,8 @@ static struct wusb_dev *wusb_dev_alloc(s req->wLength = cpu_to_le16(wusbhc->gtk.descr.bLength); return wusb_dev; +err2: + usb_free_urb(urb); err: wusb_dev_free(wusb_dev); return NULL; _ -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
