doc/share/security/patches/SA-16:38/bhyve.patch
Gleb Smirnoff cf7400e34a Document EN-16:19.tzcode, EN-16:20.tzdata, EN-16:21.localedef;
SA-16:36.telnetd, SA-16:37.libc, SA-16:38.bhyve;
2016-12-06 19:15:01 +00:00

24 lines
637 B
Diff

--- lib/libvmmapi/vmmapi.c.orig
+++ lib/libvmmapi/vmmapi.c
@@ -426,13 +426,18 @@
{
if (ctx->lowmem > 0) {
- if (gaddr < ctx->lowmem && gaddr + len <= ctx->lowmem)
+ if (gaddr < ctx->lowmem && len <= ctx->lowmem &&
+ gaddr + len <= ctx->lowmem)
return (ctx->baseaddr + gaddr);
}
if (ctx->highmem > 0) {
- if (gaddr >= 4*GB && gaddr + len <= 4*GB + ctx->highmem)
- return (ctx->baseaddr + gaddr);
+ if (gaddr >= 4*GB) {
+ if (gaddr < 4*GB + ctx->highmem &&
+ len <= ctx->highmem &&
+ gaddr + len <= 4*GB + ctx->highmem)
+ return (ctx->baseaddr + gaddr);
+ }
}
return (NULL);