keep track of which dsos have been relocated

[musl] / src / ldso / dynlink.c

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 8ade073..cb35759 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -48,6 +48,7 @@ struct dso
 };
 
 static struct dso *head, *tail, *libc;
 };
 
 static struct dso *head, *tail, *libc;

+static int trust_env;

 
 #define AUX_CNT 15
 #define DYN_CNT 34
 
 #define AUX_CNT 15
 #define DYN_CNT 34


@@ -317,6 +318,7 @@ static void reloc_all(struct dso *p)
                        2, p->syms, p->strings, p);
                do_relocs(p->base, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ],
                        3, p->syms, p->strings, p);
                        2, p->syms, p->strings, p);
                do_relocs(p->base, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ],
                        3, p->syms, p->strings, p);

+               p->relocated = 1;

        }
 }
 
        }
 }
 


@@ -373,6 +375,11 @@ void *__dynlink(int argc, char **argv, size_t *got)
 
        /* At this point the standard library is fully functional */
 
 
        /* At this point the standard library is fully functional */
 

+       /* Only trust user/env if kernel says we're not suid/sgid */
+       trust_env = (aux[0]&0x7800)==0x7800
+               && aux[AT_UID]==aux[AT_EUID]
+               && aux[AT_GID]==aux[AT_EGID];
+

        head = tail = &app;
        libc = &lib;
        app.next = 0;
        head = tail = &app;
        libc = &lib;
        app.next = 0;