select: fix 64-bit timeout truncation on pre-time64 kernels

[musl] / ldso / dynlink.c

diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 7b47b16..fde5f34 100644 (file)
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -21,9 +21,15 @@
 #include <sys/membarrier.h>
 #include "pthread_impl.h"
 #include "fork_impl.h"
-#include "libc.h"
 #include "dynlink.h"
 
+static size_t ldso_page_size;
+#ifndef PAGE_SIZE
+#define PAGE_SIZE ldso_page_size
+#endif
+
+#include "libc.h"
+
 #define malloc __libc_malloc
 #define calloc __libc_calloc
 #define realloc __libc_realloc
@@ -552,6 +558,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
 
 static void do_relr_relocs(struct dso *dso, size_t *relr, size_t relr_size)
 {
+       if (dso == &ldso) return; /* self-relocation was done in _dlstart */
        unsigned char *base = dso->base;
        size_t *reloc_addr;
        for (; relr_size; relr++, relr_size-=sizeof(size_t))
@@ -1722,6 +1729,7 @@ hidden void __dls2(unsigned char *base, size_t *sp)
        ldso.phnum = ehdr->e_phnum;
        ldso.phdr = laddr(&ldso, ehdr->e_phoff);
        ldso.phentsize = ehdr->e_phentsize;
+       search_vec(auxv, &ldso_page_size, AT_PAGESZ);
        kernel_mapped_dso(&ldso);
        decode_dyn(&ldso);
 
@@ -1984,6 +1992,10 @@ void __dls3(size_t *sp, size_t *auxv)
                        size_t *ptr = (size_t *) app.dynv[i+1];
                        *ptr = (size_t)&debug;
                }
+               if (app.dynv[i]==DT_DEBUG_INDIRECT_REL) {
+                       size_t *ptr = (size_t *)((size_t)&app.dynv[i] + app.dynv[i+1]);
+                       *ptr = (size_t)&debug;
+               }
        }
 
        /* This must be done before final relocations, since it calls