diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-05-11 11:14:58 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-05-11 11:14:58 +0000 |
commit | 68c4b497dd7306e0146ebd8b3bbc8289ed4c6e33 (patch) | |
tree | b76126f13f820979dac7a8084bd5a82f39c82995 /ldso/ldso/dl-elf.c | |
parent | fd4f96fda50d2462621de89762659e7cc7d648a9 (diff) |
make certain that getpagesize() returns correct the value for mips
by extracting the value from the ELF header.
Diffstat (limited to 'ldso/ldso/dl-elf.c')
-rw-r--r-- | ldso/ldso/dl-elf.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 3341fdd80..dc20252d0 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -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 |