From owner-svn-src-stable-7@FreeBSD.ORG Mon Oct 27 13:56:28 2008 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 206011065674; Mon, 27 Oct 2008 13:56:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0DCD88FC2C; Mon, 27 Oct 2008 13:56:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RDuR59041127; Mon, 27 Oct 2008 13:56:27 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RDuRjt041126; Mon, 27 Oct 2008 13:56:27 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200810271356.m9RDuRjt041126@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 27 Oct 2008 13:56:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184335 - in stable/7/sys: . kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2008 13:56:28 -0000 Author: kib Date: Mon Oct 27 13:56:27 2008 New Revision: 184335 URL: http://svn.freebsd.org/changeset/base/184335 Log: MFC r175105 (by peter): Fall back to the binary-specified interpreter (ld-elf.so.1) if the ABI override binary isn't found. MFC r183694: If the ABI-overriden interpreter was not loaded, do not set have_interp to TRUE. Approved by: re (kensmith) Modified: stable/7/sys/ (props changed) stable/7/sys/kern/imgact_elf.c Modified: stable/7/sys/kern/imgact_elf.c ============================================================================== --- stable/7/sys/kern/imgact_elf.c Mon Oct 27 13:54:54 2008 (r184334) +++ stable/7/sys/kern/imgact_elf.c Mon Oct 27 13:56:27 2008 (r184335) @@ -612,7 +612,7 @@ __CONCAT(exec_, __elfN(imgact))(struct i 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 i 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 i 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,15 @@ __CONCAT(exec_, __elfN(imgact))(struct i &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); + if (error == 0) + have_interp = TRUE; + } + if (!have_interp) { error = __elfN(load_file)(imgp->proc, interp, &addr, &imgp->entry_addr, sv->sv_pagesize); }