From 278a06d7abcc8774ba9bb9c15779749c7e2d68cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20VINCENT?= Date: Mon, 7 Apr 2014 10:04:40 +0200 Subject: ldso: fix standalone execution on x86_64 architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the dynamic linker is built with LDSO_STANDALONE_SUPPORT=y, it can load then run a dynamically linked program when explicitly invoked from the command line. This is used for test and prelink purposes, and also by other tools like PRoot to force the kernel to load the right ELF interpreter. This feature is currently broken on x86_64 since the number of command line arguments (ie. argc) passed from the kernel is an "elf_addr_t" (64 bit on x86_64), whereas it is read as an "unsigned int" (32 bit on x86_64). Ref: https://github.com/cedric-vincent/PRoot/issues/45 Signed-off-by: Cédric VINCENT Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/ldso.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 0c2ed07bf..3b00e053d 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -526,8 +526,8 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, #ifdef __LDSO_STANDALONE_SUPPORT__ if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) { - unsigned int *aux_dat = (unsigned int *) argv; - int argc = aux_dat[-1]; + int argc = (int) aux_dat[-1]; + ElfW(Addr) *aux_dat = (ElfW(Addr) *) argv; tpnt->libname = argv[0]; while (argc > 1) -- cgit v1.2.3