aboutsummaryrefslogtreecommitdiff
path: root/website/static/security/patches/SA-16:38/bhyve-10.patch
blob: aabab5315d2ce3f7435e5d6698a016ecec74507a (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
--- lib/libvmmapi/vmmapi.c.orig
+++ lib/libvmmapi/vmmapi.c
@@ -263,12 +263,14 @@
 	/* XXX VM_MMAP_SPARSE not implemented yet */
 	assert(ctx->vms == VM_MMAP_ALL);
 
-	if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem)
+	if (gaddr < ctx->lowmem && len <= ctx->lowmem &&
+	    gaddr + len <= ctx->lowmem)
 		return ((void *)(ctx->lowmem_addr + gaddr));
 
 	if (gaddr >= 4*GB) {
 		gaddr -= 4*GB;
-		if (gaddr < ctx->highmem && gaddr + len <= ctx->highmem)
+		if (gaddr < ctx->highmem && len <= ctx->highmem &&
+		    gaddr + len <= ctx->highmem)
 			return ((void *)(ctx->highmem_addr + gaddr));
 	}