diff options
author | Julia Lawall <julia@diku.dk> | 2009-11-21 06:51:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 14:55:26 -0500 |
commit | 06e182911da95a304eaab71288a47bc5c799c4eb (patch) | |
tree | 6eb6fa0527c05331ce97db6bc81577f89d58fe6b /drivers/usb/host | |
parent | 0c7a2b72746a96f999fd2728520d03d94879be69 (diff) |
USB: xhci-mem.c: introduce missing kfree
Error handling code following a kzalloc 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 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
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 kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-mem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 711dc554e716..9034721106d7 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
@@ -779,14 +779,17 @@ struct xhci_command *xhci_alloc_command(struct xhci_hcd *xhci, | |||
779 | 779 | ||
780 | command->in_ctx = | 780 | command->in_ctx = |
781 | xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_INPUT, mem_flags); | 781 | xhci_alloc_container_ctx(xhci, XHCI_CTX_TYPE_INPUT, mem_flags); |
782 | if (!command->in_ctx) | 782 | if (!command->in_ctx) { |
783 | kfree(command); | ||
783 | return NULL; | 784 | return NULL; |
785 | } | ||
784 | 786 | ||
785 | if (allocate_completion) { | 787 | if (allocate_completion) { |
786 | command->completion = | 788 | command->completion = |
787 | kzalloc(sizeof(struct completion), mem_flags); | 789 | kzalloc(sizeof(struct completion), mem_flags); |
788 | if (!command->completion) { | 790 | if (!command->completion) { |
789 | xhci_free_container_ctx(xhci, command->in_ctx); | 791 | xhci_free_container_ctx(xhci, command->in_ctx); |
792 | kfree(command); | ||
790 | return NULL; | 793 | return NULL; |
791 | } | 794 | } |
792 | init_completion(command->completion); | 795 | init_completion(command->completion); |