d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fall back to the binary-specified interpreter (ld-elf.so.1) if the

Browse Source 
ABI override binary isn't found.  This could probably be smoother, but
it is what I did in p4 change #126891 on 2007/09/27.  It should solve
the "ld-elf32.so.1"-in-chroot problem.
This commit is contained in:
peter 2008-01-05 08:35:56 +00:00
parent ebfbe60329
commit 1e0f13faf7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/imgact_elf.c
View File

@ -612,7 +612,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
u_long seg_size, seg_addr;
u_long addr, entry = 0, proghdr = 0;
int error = 0, i;
const char *interp = NULL;
const char *interp = NULL, *newinterp = NULL;
Elf_Brandinfo *brand_info;
const Elf_Note *note, *note_end;
char *path;
@ -665,7 +665,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
return (ENOEXEC);
sv = brand_info->sysvec;
if (interp != NULL && brand_info->interp_newpath != NULL)
interp = brand_info->interp_newpath;
newinterp = brand_info->interp_newpath;
/*
* Avoid a possible deadlock if the current address space is destroyed
@ -802,6 +802,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
imgp->entry_addr = entry;
if (interp != NULL) {
int have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0, td);
if (brand_info->emul_path != NULL &&
brand_info->emul_path[0] != '\0') {
@ -812,9 +813,14 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
&imgp->entry_addr, sv->sv_pagesize);
free(path, M_TEMP);
if (error == 0)
interp = NULL;
have_interp = TRUE;
}
if (interp != NULL) {
if (!have_interp && newinterp != NULL) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr, sv->sv_pagesize);
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr, sv->sv_pagesize);
}