Module Name: src
Committed By: christos
Date: Fri Oct 3 20:56:24 UTC 2014
Modified Files:
src/sys/arch/xen/xen: privcmd.c
Log Message:
correct error paths; still need to verify that the "didn't give us back..."
case is correct.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/xen/privcmd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/privcmd.c
diff -u src/sys/arch/xen/xen/privcmd.c:1.47 src/sys/arch/xen/xen/privcmd.c:1.48
--- src/sys/arch/xen/xen/privcmd.c:1.47 Sun Sep 21 12:56:44 2014
+++ src/sys/arch/xen/xen/privcmd.c Fri Oct 3 16:56:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.47 2014/09/21 16:56:44 christos Exp $ */
+/* $NetBSD: privcmd.c,v 1.48 2014/10/03 20:56:24 christos Exp $ */
/*-
* Copyright (c) 2004 Christian Limpach.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.47 2014/09/21 16:56:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.48 2014/10/03 20:56:24 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -576,12 +576,13 @@ privcmd_map_obj(struct vm_map *map, vadd
if (error) {
if (obj)
obj->uobj.pgops->pgo_detach(&obj->uobj);
- kmem_free(maddr, sizeof(paddr_t) * npages);
- kmem_free(obj, sizeof(*obj));
return error;
}
if (newstart != start) {
printf("uvm_map didn't give us back our vm space\n");
+ uvm_unmap1(map, newstart, newstart + size, 0);
+ if (obj)
+ obj->uobj.pgops->pgo_detach(&obj->uobj);
return EINVAL;
}
return 0;
