generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d004dc99: Merge "Use MAP_FIXED when allocating prelinked shared library regions"

Browse Source 
* commit 'd004dc9957cd8944d3db8ed92544c8ee65b117ca':
  Use MAP_FIXED when allocating prelinked shared library regions
This commit is contained in:
David Turner 2011-05-02 12:34:57 -07:00 committed by Android Git Automerger
commit 1af88c9743
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/linker.c
View File

@ -822,7 +822,7 @@ get_lib_extents(int fd, const char *name, void *__hdr, unsigned *total_sz)
static int reserve_mem_region(soinfo *si) static int reserve_mem_region(soinfo *si)
{ {
void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC, void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (base == MAP_FAILED) { if (base == MAP_FAILED) {
DL_ERR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x " DL_ERR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x "
"as requested, will try general pool: %d (%s)", "as requested, will try general pool: %d (%s)",