 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.10 2009/12/08 02:21:16 mrg Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.50.54.1.4.11 2009/12/14 07:13:31 mrg Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by Ralph
  * Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,53 +25,55 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.10 2009/12/08 02:21:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.50.54.1.4.11 2009/12/14 07:13:31 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
 #include "opt_execfmt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <uvm/uvm_extern.h>
 #ifdef EXEC_ECOFF
 #include <sys/exec_ecoff.h>
 #endif
 #include <sys/exec_elf.h>			/* mandatory */
 #ifdef COMPAT_09
 #include <machine/bsd-aout.h>
 #endif
 #include <machine/reg.h>
 #include <mips/regnum.h>			/* symbolic register indices */
 #include <compat/common/compat_util.h>
 int	mips_elf_makecmds(struct lwp *, struct exec_package *);
 /*
  * cpu_exec_aout_makecmds():
  *	cpu-dependent a.out format hook for execve().
+ *
  * Determine of the given exec package refers to something which we
  * understand and, if so, set up the vmcmds for it.
+ *
  */
 int
 cpu_exec_aout_makecmds(l, epp)
 @@ -300,62 +302,26 @@ mips_elf_makecmds (l, epp)
 	 * note that in memory, things assumed to be: 0 ....... ep_maxsaddr
 	 * <stack> ep_minsaddr
 	 */
 	NEW_VMCMD2(&epp->ep_vmcmds, vmcmd_map_zero,
 	    ((epp->ep_minsaddr - epp->ep_ssize) - epp->ep_maxsaddr),
 	    epp->ep_maxsaddr, NULLVP, 0, VM_PROT_NONE, VMCMD_STACK);
 	NEW_VMCMD2(&epp->ep_vmcmds, vmcmd_map_zero, epp->ep_ssize,
 	    (epp->ep_minsaddr - epp->ep_ssize), NULLVP, 0,
 	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE, VMCMD_STACK);
 	return 0;
+}
 static int
 elf_check_itp(struct exec_package *epp, const char *itp,
 	const char *itp_suffix)
 	if (itp) {
 		/*
 		 * If the path is exactly "/usr/libexec/ld.elf_so", first
 		 * try to see if "/usr/libexec/ld.elf_so-<abi>" exists
 		 * and if so, use that instead.
 		 * XXX maybe move this into compat/common
 		 */
 		if (strcmp(itp, "/usr/libexec/ld.elf_so") == 0 ||
 		    strcmp(itp, "/libexec/ld.elf_so") == 0) {
 			struct nameidata nd;
 			char *path;
 			int error;
 			path = PNBUF_GET();
 			snprintf(path, MAXPATHLEN, "%s-%s", itp, itp_suffix);
 			NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path);
 			error = namei(&nd);
 			/*
 			 * If that worked, replace interpreter in case we
 			 * actually need to load it
 			 */
 			if (error == 0) {
 				if (epp->ep_interp != NULL)
 					vrele(epp->ep_interp);
 				epp->ep_interp = nd.ni_vp;
 			PNBUF_PUT(path);
 	return 0;
 #if EXEC_ELF32
 int
 mips_netbsd_elf32_probe(struct lwp *l, struct exec_package *epp, void *eh0,
 	char *itp, vaddr_t *start_p)
+{
 	struct proc * const p = l->l_proc;
 	const Elf32_Ehdr * const eh = eh0;
 	int old_abi = p->p_md.md_abi;
 	const char *itp_suffix = NULL;
 	/*
 	 * Verify we can support the architecture.
 	 */
 @@ -397,27 +363,28 @@ mips_netbsd_elf32_probe(struct lwp *l, s
 	case EF_MIPS_ABI_O32:
 		itp_suffix = "o32";
 		p->p_md.md_abi = _MIPS_BSD_API_O32;
 #ifdef COMPAT_16
 		*start_p = ELF32_LINK_ADDR;
 #endif
 		if (old_abi != p->p_md.md_abi)
 			printf("pid %d(%s): ABI set to O32 (e_flags=%#x)\n", p->p_pid, p->p_comm, eh->e_flags);
 		break;
 	default:
 		return ENOEXEC;
+	}
-	return elf_check_itp(epp, itp, itp_suffix);
+	(void)compat_elf_check_interp(epp, itp, itp_suffix);
 	return 0;
+}
 void
 coredump_elf32_setup(struct lwp *l, void *eh0)
+{
 	struct proc * const p = l->l_proc;
 	Elf32_Ehdr * const eh = eh0;
 	/*
 	 * Mark the type of CPU that the dump happened on.
 	 */
 	if (cpu_arch & CPU_ARCH_MIPS64) {
 		eh->e_flags |= EF_MIPS_ARCH_64;
 @@ -490,27 +457,28 @@ mips_netbsd_elf64_probe(struct lwp *l, s
 		if (old_abi != p->p_md.md_abi)
 			printf("pid %d(%s): ABI set to N64 (e_flags=%#x)\n", p->p_pid, p->p_comm, eh->e_flags);
 		break;
 	case EF_MIPS_ABI_O64:
 		itp_suffix = "o64";
 		p->p_md.md_abi = _MIPS_BSD_API_O64;
 		if (old_abi != p->p_md.md_abi)
 			printf("pid %d(%s): ABI set to O64 (e_flags=%#x)\n", p->p_pid, p->p_comm, eh->e_flags);
 		break;
 	default:
 		return ENOEXEC;
+	}
-	return elf_check_itp(epp, itp, itp_suffix);
+	(void)compat_elf_check_interp(epp, itp, itp_suffix);
 	return 0;
+}
 void
 coredump_elf64_setup(struct lwp *l, void *eh0)
+{
 	struct proc * const p = l->l_proc;
 	Elf64_Ehdr * const eh = eh0;
 	/*
 	 * Mark the type of CPU that the dump happened on.
 	 */
 	if (cpu_arch & CPU_ARCH_MIPS64) {
 		eh->e_flags |= EF_MIPS_ARCH_64;

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: compat_util.c,v 1.41 2008/04/28 20:23:41 martin Exp $	*/
+/* 	$NetBSD: compat_util.c,v 1.41.18.1 2009/12/14 07:13:31 mrg Exp $	*/
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas and Frank van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,28 +19,56 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 2008, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.41 2008/04/28 20:23:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.41.18.1 2009/12/14 07:13:31 mrg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/exec.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 @@ -138,13 +166,59 @@ emul_flags_translate(const struct emul_f
+}
 void
 compat_offseterr(struct vnode *vp, const char *msg)
+{
 	struct mount *mp;
 	mp = vp->v_mount;
 	log(LOG_ERR, "%s: dir offset too large on fs %s (mounted from %s)\n",
 	    msg, mp->mnt_stat.f_mntonname, mp->mnt_stat.f_mntfromname);
 	uprintf("%s: dir offset too large for emulated program\n", msg);
+}
 /*
  * Look for native NetBSD compatibility libraries, usually interp-ABI.
  * It returns 0 if it changed the interpreter, otherwise it returns
  * the error from namei().  Callers should not try any more processing
  * if this returns 0.
  */
 int
 compat_elf_check_interp(struct exec_package *epp,
 			char *interp,
 			const char *interp_suffix)
+{
 	int error = 0;
 	/*
 	 * Don't look for something else, if someone has already found and
 	 * setup the ep_interp already.
 	 */
 	if (interp && epp->ep_interp == NULL) {
 		/*
 		 * If the path is exactly "/usr/libexec/ld.elf_so", first
 		 * try to see if "/usr/libexec/ld.elf_so-<abi>" exists
 		 * and if so, use that instead.
 		 */
 		if (strcmp(interp, "/usr/libexec/ld.elf_so") == 0 ||
 		    strcmp(interp, "/libexec/ld.elf_so") == 0) {
 			struct nameidata nd;
 			char *path;
 			path = PNBUF_GET();
 			snprintf(path, MAXPATHLEN, "%s-%s", interp, interp_suffix);
 			NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path);
 			error = namei(&nd);
 			/*
 			 * If that worked, replace interpreter in case we
 			 * actually need to load it
 			 */
 			if (error == 0) {
 				epp->ep_interp = nd.ni_vp;
 				snprintf(interp, MAXPATHLEN, "%s", path);
+			}
 			PNBUF_PUT(path);
+		}
+	}
 	return error;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_util.h,v 1.20 2008/04/28 20:23:41 martin Exp $	*/
+/*	$NetBSD: compat_util.h,v 1.20.14.1 2009/12/14 07:13:31 mrg Exp $	*/
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,26 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1995 Frank van der Linden
  * Copyright (c) 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
 @@ -69,14 +70,16 @@ struct emul_flags_xtab {
 	unsigned long oval;
 	unsigned long nval;
 };
 void emul_find_root(struct lwp *, struct exec_package *);
 int emul_find_interp(struct lwp *, struct exec_package *, const char *);
 unsigned long emul_flags_translate(const struct emul_flags_xtab *tab,
 				   unsigned long in, unsigned long *leftover);
 void compat_offseterr(struct vnode *, const char *);
 int compat_elf_check_interp(struct exec_package *, char *, const char *);
 #endif /* !_COMPAT_UTIL_H_ */

 @@ -1,18 +1,18 @@
-/*	$NetBSD: netbsd32_exec_elf32.c,v 1.29.14.1 2009/09/12 17:45:08 matt Exp $	*/
+/*	$NetBSD: netbsd32_exec_elf32.c,v 1.29.14.2 2009/12/14 07:13:31 mrg Exp $	*/
 /*	from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
 /*
- * Copyright (c) 1998, 2001 Matthew R. Green.
+ * Copyright (c) 1998, 2001, 2008 Matthew R. Green.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -47,43 +47,45 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.29.14.1 2009/09/12 17:45:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.29.14.2 2009/12/14 07:13:31 mrg Exp $");
 #define	ELFSIZE		32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/kauth.h>
 #include <sys/namei.h>
 #include <compat/common/compat_util.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_exec.h>
 #include <machine/netbsd32_machdep.h>
 int netbsd32_copyinargs(struct exec_package *, struct ps_strings *,
 			void *, size_t, const void *, const void *);
 int ELFNAME2(netbsd32,probe_noteless)(struct lwp *, struct exec_package *epp,
 				      void *eh, char *itp, vaddr_t *pos);
 extern int ELFNAME2(netbsd,signature)(struct lwp *, struct exec_package *,
 				      Elf_Ehdr *);
 int
 @@ -99,63 +101,31 @@ ELFNAME2(netbsd32,probe)(struct lwp *l,
 	if ((error = ELF_MD_PROBE_FUNC(l, epp, eh, itp, pos)) != 0)
 		return error;
 #elif defined(ELF_INTERP_NON_RELOCATABLE)
 	*pos = ELF_LINK_ADDR;
 #endif
 	return ELFNAME2(netbsd32,probe_noteless)(l, epp, eh, itp, pos);
+}
 int
 ELFNAME2(netbsd32,probe_noteless)(struct lwp *l, struct exec_package *epp,
 				  void *eh, char *itp, vaddr_t *pos)
+{
 	int error;
-	if (itp) {
+	if (itp && epp->ep_interp == NULL) {
-		/*
+		extern const char machine32[];
-		 * If the path is exactly "/usr/libexec/ld.elf_so", first
+		(void)compat_elf_check_interp(epp, itp, machine32);
 		 * try to see if "/usr/libexec/ld.elf_so-<arch>" exists
 		 * and if so, use that instead.
 		 * XXX maybe move this into compat/common
 		 */
 		error = 0;
 		if (strcmp(itp, "/usr/libexec/ld.elf_so") == 0 ||
 		    strcmp(itp, "/libexec/ld.elf_so") == 0) {
 			extern const char machine32[];
 			struct nameidata nd;
 			char *path;
 			if (epp->ep_interp != NULL)
 				vrele(epp->ep_interp);
 			path = PNBUF_GET();
 			snprintf(path, MAXPATHLEN, "%s-%s", itp, machine32);
 			NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path);
 			error = namei(&nd);
 			/*
 			 * If that worked, save interpreter in case we
 			 * actually need to load it
 			 */
 			if (error != 0)
 				epp->ep_interp = NULL;
 			else
 				epp->ep_interp = nd.ni_vp;
 			PNBUF_PUT(path);
 		/* Translate interpreter name if needed */
 		if (error && (error = emul_find_interp(l, epp, itp)) != 0)
 			return error;
+	}
 	epp->ep_flags |= EXEC_32;
 	epp->ep_vm_minaddr = VM_MIN_ADDRESS;
 	epp->ep_vm_maxaddr = USRSTACK32;
 #ifdef ELF_INTERP_NON_RELOCATABLE
 	*pos = ELF_LINK_ADDR;
 #endif
 	return 0;
+}
 /* round up and down to page boundaries. */
 #define	ELF_ROUND(a, b)		(((a) + (b) - 1) & ~((b) - 1))
 #define	ELF_TRUNC(a, b)		((a) & ~((b) - 1))