make certain that getpagesize() returns correct the value for mips

by extracting the value from the ELF header.

4 files changed, 22 insertions, 15 deletions

diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 6d3df05dc..6c01cebc1 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -45,6 +45,7 @@ extern unsigned char *_dl_mmap_zero;   /* Also used by _dl_malloc */
 extern unsigned long *_dl_brkp;        /* The end of the data segment for brk and sbrk */
 extern unsigned long *_dl_envp;        /* The environment address */
 extern int _dl_secure;                 /* Are we dealing with setuid stuff? */
+extern size_t _dl_pagesize;            /* Store the page size for use later */
 
 #ifdef __SUPPORT_LD_DEBUG__
 extern char *_dl_debug;
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
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index 0ac5c0b48..f92febf1c 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -133,12 +133,14 @@ DL_BOOT(unsigned long args)
 	Elf32_Dyn *dpnt;
 	unsigned long *hash_addr;
 	struct r_debug *debug_addr = NULL;
+	size_t _dl_pagesize;
 	int indx;
 #if defined(__i386__)
 	int status = 0;
 #endif
 
 
+
 	/* WARNING! -- we cannot make _any_ funtion calls until we have
 	 * taken care of fixing up our own relocations.  Making static
 	 * inline calls is ok, but _no_ function calls.  Not yet
@@ -288,7 +290,8 @@ found_got:
 
 	/* Call mmap to get a page of writable memory that can be used
 	 * for _dl_malloc throughout the shared lib loader. */
-	mmap_zero = malloc_buffer = _dl_mmap((void *) 0, PAGE_SIZE,
+	_dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : 4096;
+	mmap_zero = malloc_buffer = _dl_mmap((void *) 0, _dl_pagesize,
 			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (_dl_mmap_check_error(mmap_zero)) {
 		SEND_STDERR("dl_boot: mmap of a spare page failed!\n");
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index eed37c964..bd1e3cb30 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -46,6 +46,7 @@ unsigned char *_dl_mmap_zero   = 0;		/* Also used by _dl_malloc */
 unsigned long *_dl_brkp        = 0;		/* The end of the data segment for brk and sbrk */
 unsigned long *_dl_envp        = 0;		/* The environment address */
 int _dl_secure                 = 1;		/* Are we dealing with setuid stuff? */
+size_t _dl_pagesize            = 0;		/* Store the page size for use later */
 
 
 
@@ -102,7 +103,6 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt
 	int (*_dl_on_exit) (void (*FUNCTION)(int STATUS, void *ARG),void*);
 #endif
 
-
 #ifdef __SUPPORT_LD_DEBUG_EARLY__
 	/* Wahoo!!! */
 	SEND_STDERR("Cool, we managed to make a function call.\n");
@@ -114,6 +114,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt
 	_dl_malloc_addr = malloc_buffer;
 	_dl_mmap_zero = mmap_zero;
 
+	/* Store the page size for later use */
+	_dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : 4096;
+
 	/* Now we have done the mandatory linking of some things.  We are now
 	 * free to start using global variables, since these things have all been
 	 * fixed up by now.  Still no function calls outside of this library ,