xenbus_client.c: correct exit path for xenbus_map_ring_valloc_hvm
authorWei Liu <wei.liu2@citrix.com>
Wed, 29 May 2013 16:02:58 +0000 (17:02 +0100)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 29 May 2013 19:24:55 +0000 (15:24 -0400)
Apparently we should not free page that has not been allocated.
This is b/c alloc_xenballooned_pages will take care of freeing
the page on its own.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/xenbus/xenbus_client.c

index 61786be9138b96877ccadce65642a4590eddead1..ec097d6f964dab5e695ff9abdf818581b3473e74 100644 (file)
@@ -534,7 +534,7 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,
 
        err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr);
        if (err)
-               goto out_err;
+               goto out_err_free_ballooned_pages;
 
        spin_lock(&xenbus_valloc_lock);
        list_add(&node->next, &xenbus_valloc_pages);
@@ -543,8 +543,9 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev,
        *vaddr = addr;
        return 0;
 
- out_err:
+ out_err_free_ballooned_pages:
        free_xenballooned_pages(1, &node->page);
+ out_err:
        kfree(node);
        return err;
 }