diff options
| author | Daniel De Graaf <dgdegra@tycho.nsa.gov> | 2011-02-03 14:16:54 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-02-14 14:16:18 -0500 |
| commit | 90b6f30548a52f3a59cda5c7db0b9c2a99ebb156 (patch) | |
| tree | 837d46817deaab8185dae5c003038041ad888b0b /drivers/xen | |
| parent | bdc612dc6903c4ea06e40d02f84ad5e25d93459d (diff) | |
| download | kernel_samsung_smdk4412-90b6f30548a52f3a59cda5c7db0b9c2a99ebb156.tar.gz kernel_samsung_smdk4412-90b6f30548a52f3a59cda5c7db0b9c2a99ebb156.tar.bz2 kernel_samsung_smdk4412-90b6f30548a52f3a59cda5c7db0b9c2a99ebb156.zip | |
xen-gntdev: Fix memory leak when mmap fails
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>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/gntdev.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 9694a1a8b2e..2aa83166da3 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -650,15 +650,13 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) find_grant_ptes, map); if (err) { printk(KERN_WARNING "find_grant_ptes() failure.\n"); - return err; + goto out_put_map; } } err = map_grant_pages(map); - if (err) { - printk(KERN_WARNING "map_grant_pages() failure.\n"); - return err; - } + if (err) + goto out_put_map; 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, map->pages[i]); 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: spin_unlock(&priv->lock); return err; + +out_put_map: + gntdev_put_map(map); + return err; } static const struct file_operations gntdev_fops = { |