|
@@ -444,7 +444,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- header = _dl_mmap((void *) 0, PAGE_SIZE, PROT_READ | PROT_WRITE,
|
|
|
+ header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
|
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
if (_dl_mmap_check_error(header)) {
|
|
|
_dl_dprintf(2, "%s: can't map '%s'\n", _dl_progname, libname);
|
|
@@ -453,7 +453,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
return NULL;
|
|
|
};
|
|
|
|
|
|
- _dl_read(infile, header, PAGE_SIZE);
|
|
|
+ _dl_read(infile, header, _dl_pagesize);
|
|
|
epnt = (ElfW(Ehdr) *) (intptr_t) header;
|
|
|
if (epnt->e_ident[0] != 0x7f ||
|
|
|
epnt->e_ident[1] != 'E' ||
|
|
@@ -464,7 +464,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
libname);
|
|
|
_dl_internal_error_number = LD_ERROR_NOTELF;
|
|
|
_dl_close(infile);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
};
|
|
|
|
|
@@ -479,7 +479,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
_dl_dprintf(2, "%s: '%s' is not an ELF executable for " ELF_TARGET
|
|
|
"\n", _dl_progname, libname);
|
|
|
_dl_close(infile);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
};
|
|
|
|
|
@@ -525,7 +525,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
_dl_dprintf(2, "%s: can't map %s\n", _dl_progname, libname);
|
|
|
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
|
|
|
_dl_close(infile);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
};
|
|
|
libaddr = (unsigned long) status;
|
|
@@ -560,7 +560,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
|
|
|
_dl_munmap((char *) libaddr, maxvma - minvma);
|
|
|
_dl_close(infile);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
};
|
|
|
|
|
@@ -593,7 +593,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
_dl_internal_error_number = LD_ERROR_MMAP_FAILED;
|
|
|
_dl_munmap((char *) libaddr, maxvma - minvma);
|
|
|
_dl_close(infile);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
};
|
|
|
|
|
@@ -622,7 +622,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
_dl_internal_error_number = LD_ERROR_NODYNAMIC;
|
|
|
_dl_dprintf(2, "%s: '%s' is missing a dynamic section\n",
|
|
|
_dl_progname, libname);
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
@@ -725,7 +725,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
|
|
|
|
|
|
}
|
|
|
#endif
|
|
|
- _dl_munmap(header, PAGE_SIZE);
|
|
|
+ _dl_munmap(header, _dl_pagesize);
|
|
|
|
|
|
return tpnt;
|
|
|
}
|
|
@@ -803,7 +803,7 @@ void _dl_dprintf(int fd, const char *fmt, ...)
|
|
|
char *start, *ptr, *string;
|
|
|
static char *buf;
|
|
|
|
|
|
- buf = _dl_mmap((void *) 0, PAGE_SIZE, PROT_READ | PROT_WRITE,
|
|
|
+ buf = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
|
|
|
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
|
if (_dl_mmap_check_error(buf)) {
|
|
|
_dl_write(fd, "mmap of a spare page failed!\n", 29);
|
|
@@ -815,7 +815,7 @@ void _dl_dprintf(int fd, const char *fmt, ...)
|
|
|
if (!fmt)
|
|
|
return;
|
|
|
|
|
|
- if (_dl_strlen(fmt) >= (PAGE_SIZE - 1)) {
|
|
|
+ if (_dl_strlen(fmt) >= (_dl_pagesize - 1)) {
|
|
|
_dl_write(fd, "overflow\n", 11);
|
|
|
_dl_exit(20);
|
|
|
}
|
|
@@ -873,7 +873,7 @@ void _dl_dprintf(int fd, const char *fmt, ...)
|
|
|
start = NULL;
|
|
|
}
|
|
|
}
|
|
|
- _dl_munmap(buf, PAGE_SIZE);
|
|
|
+ _dl_munmap(buf, _dl_pagesize);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -902,7 +902,7 @@ void *_dl_malloc(int size)
|
|
|
if (_dl_malloc_function)
|
|
|
return (*_dl_malloc_function) (size);
|
|
|
|
|
|
- if (_dl_malloc_addr - _dl_mmap_zero + size > PAGE_SIZE) {
|
|
|
+ if (_dl_malloc_addr - _dl_mmap_zero + size > _dl_pagesize) {
|
|
|
#ifdef __SUPPORT_LD_DEBUG_EARLY__
|
|
|
_dl_dprintf(2, "malloc: mmapping more memory\n");
|
|
|
#endif
|