lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen-gntdev: Fix memory leak when mmap fails

Browse Source 
The error path did not decrement the reference count of the grant structure.

Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Daniel De Graaf
2011-02-03 14:16:54 -05:00
committed by Konrad Rzeszutek Wilk
parent bdc612dc69
commit 90b6f30548
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/xen/gntdev.c
View File

@@ -650,15 +650,13 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
find_grant_ptes, map); find_grant_ptes, map);
if (err) { if (err) {
printk(KERN_WARNING "find_grant_ptes() failure.\n"); printk(KERN_WARNING "find_grant_ptes() failure.\n");
return err; goto out_put_map;
} }
} }
err = map_grant_pages(map); err = map_grant_pages(map);
if (err) { if (err)
printk(KERN_WARNING "map_grant_pages() failure.\n"); goto out_put_map;
return err;
}
map->is_mapped = 1; map->is_mapped = 1;
@@ -667,7 +665,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
err = vm_insert_page(vma, vma->vm_start + i*PAGE_SIZE, err = vm_insert_page(vma, vma->vm_start + i*PAGE_SIZE,
map->pages[i]); map->pages[i]);
if (err) if (err)
return err; goto out_put_map;
} }
} }
@@ -676,6 +674,10 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
unlock_out: unlock_out:
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
return err; return err;
out_put_map:
gntdev_put_map(map);
return err;
} }
static const struct file_operations gntdev_fops = { static const struct file_operations gntdev_fops = {