[Xen-devel] [PATCH] xen-gntdev: Fix memory leak when mmap fails

[Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>]

Fix for a memory leak introduced in patch 3. Doesn't merge cleanly across
patch 4; I can post a corrected version of both patches if that would be
preferred.

------------------------------------------------------------->8

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

Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
---
 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 91706c2..6c754a9 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -649,15 +649,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;
 
@@ -666,7 +664,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;
                }
        }
 
@@ -675,6 +673,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 = {
-- 
1.7.3.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel