and unconditionally defer the vm_size() call, as it doesn't have a NULL short
circuit.
Reported-by: Wei Liu <wei.l...@citrix.com>
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
Tested-by: Wei Liu <wei.l...@citrix.com>
Reviewed-by: Roger Pau Monné <roger....@citrix.com>
CC: Keir Fraser <k...@xen.org>
CC: Jan Beulich <jbeul...@suse.com>
CC: Tim Deegan <t...@xen.org>
---
xen/common/vmap.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/xen/common/vmap.c b/xen/common/vmap.c
index 8752595..ac66a8c 100644
--- a/xen/common/vmap.c
+++ b/xen/common/vmap.c
@@ -268,10 +268,14 @@ void *vzalloc(size_t size)
void vfree(void *va)
{
- unsigned int i, pages = vm_size(va);
+ unsigned int i, pages;
struct page_info *pg;
PAGE_LIST_HEAD(pg_list);
+ if ( !va )
+ return;
+
+ pages = vm_size(va);
ASSERT(pages);
for ( i = 0; i < pages; i++ )
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
