RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-06 23:28:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

plat: avoid MAP_FIXED

Browse source
This commit is contained in:
notaz 2015-03-25 00:38:13 +02:00
parent 9fec8a91c9
commit 26ea18173c
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
linux/plat.c
View file

@ -178,8 +178,10 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
req = (void *)addr; req = (void *)addr;
if (need_exec) if (need_exec)
prot |= PROT_EXEC; prot |= PROT_EXEC;
/* avoid MAP_FIXED, it overrides existing mappings..
if (is_fixed) if (is_fixed)
flags |= MAP_FIXED; flags |= MAP_FIXED;
*/
if (size >= HUGETLB_THRESHOLD) if (size >= HUGETLB_THRESHOLD)
flags |= MAP_HUGETLB; flags |= MAP_HUGETLB;
@ -197,9 +199,14 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
if (ret == MAP_FAILED) if (ret == MAP_FAILED)
return NULL; return NULL;
if (req != NULL && ret != req) if (req != NULL && ret != req) {
fprintf(stderr, fprintf(stderr, "%s: mmaped to %p, requested %p\n",
"warning: mmaped to %p, requested %p\n", ret, req); is_fixed ? "error" : "warning", ret, req);
if (is_fixed) {
munmap(ret, size);
return NULL;
}
}
return ret; return ret;
} }