From 026aff8066bc093c32dea84154f6b87d289aa9e1 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 29 May 2013 17:02:58 +0100 Subject: [PATCH] --- yaml --- r: 376437 b: refs/heads/master c: 8d0b8801c9e4c2c6b20cdac74dbab16facce7653 h: refs/heads/master i: 376435: 95bf3430bf14f4ed96d2e61a7ff60d31cd6e4a18 v: v3 --- [refs] | 2 +- trunk/drivers/xen/xenbus/xenbus_client.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5248cb2f745f..bfeae5a9a1bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d69c0e3975e4955dd596c162d1628ba1dbb1eb45 +refs/heads/master: 8d0b8801c9e4c2c6b20cdac74dbab16facce7653 diff --git a/trunk/drivers/xen/xenbus/xenbus_client.c b/trunk/drivers/xen/xenbus/xenbus_client.c index 61786be9138b..ec097d6f964d 100644 --- a/trunk/drivers/xen/xenbus/xenbus_client.c +++ b/trunk/drivers/xen/xenbus/xenbus_client.c @@ -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; }