diff options
| author | Julia Lawall <julia@diku.dk> | 2011-12-23 18:39:29 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-01-03 13:39:04 -0500 |
| commit | 2e16341438c9eca15a2e0bb2ad8555bbdf24b86d (patch) | |
| tree | af1b5c2a20ceeef6624e531ae49a92b13b2f46a9 /drivers/xen | |
| parent | 01464a60a4d21fb649e088f7ae5136c6fb130889 (diff) | |
| download | linux-stable-2e16341438c9eca15a2e0bb2ad8555bbdf24b86d.tar.gz linux-stable-2e16341438c9eca15a2e0bb2ad8555bbdf24b86d.tar.bz2 linux-stable-2e16341438c9eca15a2e0bb2ad8555bbdf24b86d.zip | |
xen-gntalloc: introduce missing kfree
Error handling code following a kmalloc should free the allocated data.
Out_unlock is used on both success and failure, so free vm_priv before
jumping to that label.
A simplified version of the semantic match that finds the problem is as
follows: (http://coccinelle.lip6.fr)
// <smpl>
@r exists@
local idexpression x;
statement S;
identifier f1;
position p1,p2;
expression *ptr != NULL;
@@
x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
when != if (...) { <+...x...+> }
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>
[v1: Altered the description a bit]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/gntalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c index e2400c8963fa..934985d14c24 100644 --- a/drivers/xen/gntalloc.c +++ b/drivers/xen/gntalloc.c @@ -525,6 +525,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma) rv = -ENOENT; pr_debug("%s: Could not find grant reference", __func__); + kfree(vm_priv); goto out_unlock; } |