Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-22 22:12:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

PROT_EXEC doesn't make sense in mmap flags. Fixes #128.

Browse source
This commit is contained in:
Jason Benaim 2019-07-28 19:03:49 -07:00
parent 118e6331ff
commit 607dc12ecf
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
os/posix/alloc.c
View file

@ -23,9 +23,10 @@ static int zero_page_fd = -1;
// Allocates a block of (R/W/X) memory.
void *cen64_alloc(struct cen64_mem *m, size_t size, bool exec) {
int flags = MAP_PRIVATE;
int perm = PROT_READ | PROT_WRITE;
if (exec)
flags |= PROT_EXEC;
perm |= PROT_EXEC;
// Use MAP_ANON on OSX because it really does not
// enjoy trying to mmap from device files...
@ -33,8 +34,9 @@ void *cen64_alloc(struct cen64_mem *m, size_t size, bool exec) {
flags |= MAP_ANON;
#endif
if ((m->ptr = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC,
if ((m->ptr = mmap(NULL, size, perm,
flags, zero_page_fd, 0)) == MAP_FAILED) {
perror("mmap");
return NULL;
}