Skip to content

Workaround problems with hardened runtime, needed for notarization #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Workaround problems with hardened runtime, needed for notarization #259

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f7bc8
Use `mmap` rather than `valloc` in `vmm_mem_alloc`
djs55 Aug 19, 2019
c0a16ba
On Majave and later, allocate with MAP_JIT
djs55 Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions src/lib/vmm/vmm_mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,55 @@

#include <stdint.h>
#include <stdlib.h>
#include <errno.h>
#include <Hypervisor/hv.h>
#include <Hypervisor/hv_vmx.h>
#include <xhyve/support/misc.h>
#include <xhyve/vmm/vmm_mem.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/sysctl.h>

/* According to the mono project
https://github.com/mono/mono/commit/a502768b3a24f4251de6a48ba78a27c898968e63
using MAP_JIT causes problems with older macOS versions so we should use it
on Mojave or later. */

static int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_JIT;

#define OSRELEASE "kern.osrelease"
#define OSRELEASE_MOJAVE 18

static long
vmm_get_kern_osrelease()
{
char *s;
size_t len;
long v;
if (sysctlbyname(OSRELEASE, NULL, &len, NULL, 0)) {
xhyve_abort("vmm_get_kern_osrelease failed to query sysctl kern.osrelease\n");
}
s = malloc(len);
if (!s) {
xhyve_abort("vmm_get_kern_osrelease failed to allocate memory for kern.osrelease\n");
}
if (sysctlbyname(OSRELEASE, s, &len, NULL, 0)){
xhyve_abort("vmm_get_kern_osrelease failed to query sysctl kern.osrelease\n");
}
v = strtol(s, NULL, 10);
if ((v == 0) && (errno != 0)) {
xhyve_abort("vmm_get_kern_osrelease failed to parse sysctl kern.osrelease value\n");
}
return v;
}

int
vmm_mem_init(void)
{
if (vmm_get_kern_osrelease() < OSRELEASE_MOJAVE) {
fprintf(stderr, "Detected macOS older than Mojave, cannot use MAP_JIT\n");
mmap_flags &= ~MAP_JIT;
}
return (0);
}

Expand All @@ -46,10 +87,9 @@ vmm_mem_alloc(uint64_t gpa, size_t size)
{
void *object;

object = valloc(size);

if (!object) {
xhyve_abort("vmm_mem_alloc failed\n");
object = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0);
if (object == MAP_FAILED) {
xhyve_abort("vmm_mem_alloc failed in mmap\n");
}

if (hv_vm_map(object, gpa, size,
Expand Down