Module Name: src
Committed By: christos
Date: Fri Oct 17 16:37:02 UTC 2014
Modified Files:
src/sys/arch/xen/xen: privcmd.c
Log Message:
now that privcmd_map_obj cleans up correctly, don't double free...
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 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.48 src/sys/arch/xen/xen/privcmd.c:1.49
--- src/sys/arch/xen/xen/privcmd.c:1.48 Fri Oct 3 16:56:24 2014
+++ src/sys/arch/xen/xen/privcmd.c Fri Oct 17 12:37:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: privcmd.c,v 1.48 2014/10/03 20:56:24 christos Exp $ */
+/* $NetBSD: privcmd.c,v 1.49 2014/10/17 16:37:02 christos Exp $ */
/*-
* Copyright (c) 2004 Christian Limpach.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.48 2014/10/03 20:56:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.49 2014/10/17 16:37:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -360,11 +360,8 @@ privcmd_ioctl(void *v)
}
error = privcmd_map_obj(vmm, va, maddr,
mentry.npages, mcmd->dom);
- if (error) {
- kmem_free(maddr,
- sizeof(paddr_t) * mentry.npages);
+ if (error)
return error;
- }
}
break;
}