From: Julia Lawall <julia@diku.dk>
To: David Vrabel <david.vrabel@csr.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH] drivers/usb/wusbcore: introduce missing usb_free_urb
Date: Sat, 21 Nov 2009 16:09:26 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.64.0911211608590.26930@ask.diku.dk> (raw)
From: Julia Lawall <julia@diku.dk>
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@diku.dk>
---
drivers/usb/wusbcore/devconnect.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 4ac4300..828310c 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -122,7 +122,7 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc)
req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
if (req == NULL)
- goto err;
+ goto err2;
req->bRequestType = USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE;
req->bRequest = USB_REQ_SET_DESCRIPTOR;
@@ -134,6 +134,8 @@ static struct wusb_dev *wusb_dev_alloc(struct wusbhc *wusbhc)
wusb_dev->set_gtk_req = req;
return wusb_dev;
+err2:
+ usb_free_urb(urb);
err:
wusb_dev_free(wusb_dev);
return NULL;
reply other threads:[~2009-11-21 15:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0911211608590.26930@ask.diku.dk \
--to=julia@diku.dk \
--cc=david.vrabel@csr.com \
--cc=gregkh@suse.de \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®